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

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>
(cherry picked from commit 78cf89c21d0f6a5966306d933150fbe3afd537a0)

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index a2651dae9c757fb23389cf2694cb149e22580c09..53c0dbba1cfd7d78b27629a342079001ebd5e8cd 100644 (file)
--- 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 {