From: Sage Weil <sage@newdream.net>
Date: Tue, 2 Nov 2021 16:28:10 +0000 (-0500)
Subject: mgr/rook/rook_cluster: do not duplicate StorageClassDeviceSets
X-Git-Tag: v17.1.0~469^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4b798d1cda5c8f899faec81034a282a83974cb2d;p=ceph.git

mgr/rook/rook_cluster: do not duplicate StorageClassDeviceSets

Signed-off-by: Joseph Sawaya <jsawaya@redhat.com>
---

diff --git a/src/pybind/mgr/rook/rook_cluster.py b/src/pybind/mgr/rook/rook_cluster.py
index a4bc0917ef6a..4a080fa92237 100644
--- a/src/pybind/mgr/rook/rook_cluster.py
+++ b/src/pybind/mgr/rook/rook_cluster.py
@@ -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