]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/rook/rook_cluster: do not duplicate StorageClassDeviceSets
authorSage Weil <sage@newdream.net>
Tue, 2 Nov 2021 16:28:10 +0000 (11:28 -0500)
committerSage Weil <sage@newdream.net>
Thu, 4 Nov 2021 15:49:50 +0000 (10:49 -0500)
Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
src/pybind/mgr/rook/rook_cluster.py

index a4bc0917ef6a8cee521a95c1bdccd10d46c15ab5..4a080fa922379597cb247dc27955aae23987c347 100644 (file)
@@ -415,9 +415,14 @@ class DefaultCreator():
             if not hasattr(new_cluster.spec.storage, 'storageClassDeviceSets') or not new_cluster.spec.storage.storageClassDeviceSets:
                 new_cluster.spec.storage.storageClassDeviceSets = ccl.StorageClassDeviceSetsList()
 
+            existing_scds = [
+                scds.name for scds in new_cluster.spec.storage.storageClassDeviceSets
+            ]
             for device in to_create:
                 new_scds = self.device_to_device_set(drive_group, device)
                 new_cluster.spec.storage.storageClassDeviceSets.append(new_scds)
+                if new_scds.name not in existing_scds:
+                    new_cluster.spec.storage.storageClassDeviceSets.append(new_scds)
             return new_cluster
         return _add_osds