From: Sage Weil <sage@inktank.com>
Date: Sun, 10 Nov 2013 05:53:14 +0000 (-0800)
Subject: mon/OSDMonitor: include osd metadata in 'ceph report'
X-Git-Tag: v0.74~37^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea9dabf7f8e7e9018d685d027ce2ba8ddc23e4a5;p=ceph.git

mon/OSDMonitor: include osd metadata in 'ceph report'

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 836cbbf3abb3..44f964d97651 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -2000,6 +2000,17 @@ void OSDMonitor::dump_info(Formatter *f)
   osdmap.dump(f);
   f->close_section();
 
+  f->open_array_section("osd_metadata");
+  for (int i=0; i<osdmap.get_max_osd(); ++i) {
+    if (osdmap.exists(i)) {
+      f->open_object_section("osd");
+      f->dump_unsigned("id", i);
+      dump_osd_metadata(i, f, NULL);
+      f->close_section();
+    }
+  }
+  f->close_section();
+
   f->dump_unsigned("osdmap_first_committed", get_first_committed());
 
   f->open_object_section("crushmap");