core: check for duplicate ceph fs pool names

Only single pool will get created if there are multiple
data pool entries with same name. This PR just adds a check
to fail if duplicate pools are present.

Signed-off-by: sp98 <sapillai@redhat.com>
This commit is contained in:
sp98 committed 2024-08-27 10:40:35 +05:30
1 parent 041da2ced3
commit 8fa8612201
2 files changed
+43

No files matched your search

+23
View File
@@ -144,6 +144,14 @@ func validateFilesystem(context *clusterd.Context, clusterInfo *cephclient.Clust
if len(f.Spec.DataPools) == 0 {
return nil
}
// Ensure duplicate pool names are not present in the spec.
if len(f.Spec.DataPools) > 1 {
if hasDuplicatePoolNames(f.Spec.DataPools) {
return errors.New("duplicate pool names in the data pool spec")
}
}
if err := cephpool.ValidatePoolSpec(context, clusterInfo, clusterSpec, &f.Spec.MetadataPool); err != nil {
return errors.Wrap(err, "invalid metadata pool")
}
@@ -157,6 +165,21 @@ func validateFilesystem(context *clusterd.Context, clusterInfo *cephclient.Clust
return nil
}
func hasDuplicatePoolNames(poolSpecList []cephv1.NamedPoolSpec) bool {
poolNames := make(map[string]struct{})
for _, poolSpec := range poolSpecList {
if poolSpec.Name != "" {
if _, has := poolNames[poolSpec.Name]; has {
logger.Errorf("duplicate pool name %q in the data pool spec", poolSpec.Name)
return true
}
poolNames[poolSpec.Name] = struct{}{}
}
}
return false
}
// newFS creates a new instance of the file (MDS) service
func newFS(name, namespace string) *Filesystem {
return &Filesystem{
+20
View File
@@ -73,6 +73,26 @@ func TestValidateSpec(t *testing.T) {
assert.Nil(t, validateFilesystem(context, clusterInfo, clusterSpec, fs))
}
func TestHasDuplicatePoolNames(t *testing.T) {
// PoolSpec with no duplicates
fs := &cephv1.CephFilesystem{
Spec: cephv1.FilesystemSpec{
DataPools: []cephv1.NamedPoolSpec{
{Name: "pool1"},
{Name: "pool2"},
},
},
}
result := hasDuplicatePoolNames(fs.Spec.DataPools)
assert.False(t, result)
// add duplicate pool name in the spec.
fs.Spec.DataPools = append(fs.Spec.DataPools, cephv1.NamedPoolSpec{Name: "pool1"})
result = hasDuplicatePoolNames(fs.Spec.DataPools)
assert.True(t, result)
}
func TestGenerateDataPoolNames(t *testing.T) {
fs := &Filesystem{Name: "fake", Namespace: "fake"}
fsSpec := cephv1.FilesystemSpec{