From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Wed, 18 Jun 2025 14:39:51 +0000 (+0000)
Subject: osd: prevent OSDMap::check_health() from asserting due to new OSDs found in subtree
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F64009%2Fhead;p=ceph.git

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>
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index cff5a615384..a6a22e88043 100644
--- 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 {