]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
OSDMonitor: exclude destroyed OSDs from "ceph node ls" output 62327/head
authorNitzan Mordechai <nmordech@redhat.com>
Tue, 11 Mar 2025 15:37:07 +0000 (15:37 +0000)
committerNitzan Mordechai <nmordech@redhat.com>
Sun, 16 Mar 2025 09:47:40 +0000 (09:47 +0000)
After destroying an OSD, the command "ceph node ls" still listed the destroyed OSD,
causing confusion. This fix ensures that the status of the OSD is checked before
adding it to the output, aligning its behavior with "ceph osd tree," which already
displays the correct status.

Fixes: https://tracker.ceph.com/issues/70400
Signed-off-by: Nitzan Mordechai <nmordech@redhat.com>
(cherry picked from commit 97c43c728dc8e702ce19bc14f6aa9a4790c8415b)

src/mon/OSDMonitor.cc

index f12ad4ea40573c34e4c357052db717b47fb633c9..131e99928e9e8b765ab86e6d70ed062632ae0202 100644 (file)
@@ -2205,6 +2205,9 @@ void OSDMonitor::print_nodes(Formatter *f)
       // not likely though
       continue;
     }
+    if (osdmap.is_destroyed(osd)) {
+      continue;
+    }
     osds[hostname->second].push_back(osd);
   }