Skip to content

Commit 2a6b105

Browse files
committed
mgr/cephadm: make nvme-gw adds be able to handle multiple services/groups
Before this was grabbing the service spec for the first daemon description in the list. This meant every daemon would be added with the pool/group of whatever that spec happened to specify. This patch grabs the spec, and therefore also the pool/group individually for each nvmeof daemon Signed-off-by: Adam King <[email protected]>
1 parent d7b00ea commit 2a6b105

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/pybind/mgr/cephadm/services/nvmeof.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ def daemon_check_post(self, daemon_descrs: List[DaemonDescription]) -> None:
9292
""" Overrides the daemon_check_post to add nvmeof gateways safely
9393
"""
9494
self.mgr.log.info(f"nvmeof daemon_check_post {daemon_descrs}")
95-
spec = cast(NvmeofServiceSpec,
96-
self.mgr.spec_store.all_specs.get(daemon_descrs[0].service_name(), None))
97-
if not spec:
98-
self.mgr.log.error(f'Failed to find spec for {daemon_descrs[0].name()}')
99-
return
100-
pool = spec.pool
101-
group = spec.group
10295
for dd in daemon_descrs:
96+
spec = cast(NvmeofServiceSpec,
97+
self.mgr.spec_store.all_specs.get(dd.service_name(), None))
98+
if not spec:
99+
self.mgr.log.error(f'Failed to find spec for {dd.name()}')
100+
return
101+
pool = spec.pool
102+
group = spec.group
103103
# Notify monitor about this gateway creation
104104
cmd = {
105105
'prefix': 'nvme-gw create',

0 commit comments

Comments
 (0)