osd: prevent OSDMap::check_health() from asserting due to new OSDs found in subtree

rzarzynski · rzarzynski · commit 78cf89c21d0f · 2025-06-18T14:39:54.000Z
For RCA please refer to: https://tracker.ceph.com/issues/70869#note-9. Fixes: https://tracker.ceph.com/issues/70869 Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
@@ -369,7 +369,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
`@@ -369,7 +369,7 @@ bool OSDMap::subtree_type_is_down(`
`369`	`369`	`{`
`370`	`370`	`if (id >= 0) {`
`371`	`371`	`bool is_down_ret = is_down(id);`
`372`		`- if (!is_out(id)) {`
	`372`	`+ if (!is_out(id) && !(osd_state[id] & CEPH_OSD_NEW)) {`
`373`	`373`	`if (is_down_ret) {`
`374`	`374`	`down_in_osds->insert(id);`
`375`	`375`	`} else {`