Skip to content

Commit e681d37

Browse files
committed
mgr/cephadm: don't block matching group for identical nvmeof services
This was incorrectly handled as part of ceph@85d2633 which intended to block having multiple nvmeof services with the same group, but forgot to verify the spec being applied wasn't just an update on a prevoiously applied service Signed-off-by: Adam King <[email protected]>
1 parent f1c1e35 commit e681d37

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/pybind/mgr/cephadm/module.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3416,7 +3416,7 @@ def _apply_service_spec(self, spec: ServiceSpec) -> str:
34163416
f"group name '{nvmeof_spec.group}' and service id '{nvmeof_spec.service_id}'")
34173417
for sspec in [s.spec for s in self.spec_store.get_by_service_type('nvmeof')]:
34183418
nspec = cast(NvmeofServiceSpec, sspec)
3419-
if nvmeof_spec.group == nspec.group:
3419+
if nvmeof_spec.group == nspec.group and nvmeof_spec.service_id != nspec.service_id:
34203420
raise OrchestratorError(f"Cannot create nvmeof service with group {nvmeof_spec.group}. That group is already "
34213421
f"being used by the service {nspec.service_name()}")
34223422

0 commit comments

Comments
 (0)