Merge pull request ceph#64009 from rzarzynski/wip-bug-70869

rzarzynski · web-flow · commit 353eaffcb6b2 · 2025-10-13T12:22:21.000+02:00
osd: prevent OSDMap::check_health() from asserting due to new OSDs found in subtree

Reviewed-by: Ronen Friedman &lt;rfriedma@redhat.com&gt;
Reviewed-by: Josh Durgin &lt;jdurgin@ibm.com&gt;
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -374,7 +374,7 @@ bool OSDMap::subtree_type_is_down(
 {
   if (id >= 0) {
     bool is_down_ret = is_down(id);
-    if (!is_out(id)) {
+    if (!is_out(id) && !(osd_state[id] & CEPH_OSD_NEW)) {
       if (is_down_ret) {
         down_in_osds->insert(id);
       } else {

Original file line number	Diff line number	Diff line change
`@@ -374,7 +374,7 @@ bool OSDMap::subtree_type_is_down(`
`374`	`374`	`{`
`375`	`375`	`if (id >= 0) {`
`376`	`376`	`bool is_down_ret = is_down(id);`
`377`		`- if (!is_out(id)) {`
	`377`	`+ if (!is_out(id) && !(osd_state[id] & CEPH_OSD_NEW)) {`
`378`	`378`	`if (is_down_ret) {`
`379`	`379`	`down_in_osds->insert(id);`
`380`	`380`	`} else {`