From 4b798d1cda5c8f899faec81034a282a83974cb2d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 2 Nov 2021 11:28:10 -0500 Subject: [PATCH] mgr/rook/rook_cluster: do not duplicate StorageClassDeviceSets Signed-off-by: Joseph Sawaya --- src/pybind/mgr/rook/rook_cluster.py | 5 +++++ 1 file changed, 5 insertions(+) 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 -- 2.47.3