Merge pull request ceph#62935 from adk3798/cephadm-fix-shell-name-stopped-daemon

adk3798 · web-flow · commit 12ffad5d161f · 2025-06-04T20:59:09.000-04:00
cephadm: don't collect image ids for daemons with no container info

Reviewed-by: John Mulligan &lt;jmulligan@redhat.com&gt;
Reviewed-by: Redouane Kachach &lt;rkachach@ibm.com&gt;
diff --git a/src/cephadm/cephadmlib/container_lookup.py b/src/cephadm/cephadmlib/container_lookup.py
@@ -132,7 +132,9 @@ def infer_local_ceph_image(
     ]
     # collect the running ceph daemon image ids
     images_in_use_by_daemon = set(
-        d.image_id for d, n in matching_daemons if n == daemon_name
+        d.image_id
+        for d, n in matching_daemons
+        if (n == daemon_name and d is not None)
     )
     images_in_use = set(
         d.image_id for d, _ in matching_daemons if d is not None

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,9 @@ def infer_local_ceph_image(`
`132`	`132`	`]`
`133`	`133`	`# collect the running ceph daemon image ids`
`134`	`134`	`images_in_use_by_daemon = set(`
`135`		`- d.image_id for d, n in matching_daemons if n == daemon_name`
	`135`	`+ d.image_id`
	`136`	`+ for d, n in matching_daemons`
	`137`	`+ if (n == daemon_name and d is not None)`
`136`	`138`	`)`
`137`	`139`	`images_in_use = set(`
`138`	`140`	`d.image_id for d, _ in matching_daemons if d is not None`