mon/OSDMonitor: dump osdmap manifest alongside other infos

Signed-off-by: Joao Eduardo Luis <joao@suse.de>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 909b21442a4f5cc4bba180b3f66b6283efbe4940..7ef7301ea183044fec262e3ef377d14535d4831e 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4057,6 +4057,12 @@ void OSDMonitor::dump_info(Formatter *f)
   f->open_object_section("crushmap");
   osdmap.crush->dump(f);
   f->close_section();
+
+  if (has_osdmap_manifest) {
+    f->open_object_section("osdmap_manifest");
+    osdmap_manifest.dump(f);
+    f->close_section();
+  }
 }
 
 namespace {

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 435f1d70c9b3ceca3105bd3827c0318218956b5c..6fde3ac7b0c7ea25f6537209012811c5c8f55484 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -192,6 +192,15 @@ struct osdmap_manifest_t {
     decode(p);
   }
 
+  void dump(Formatter *f) {
+    f->dump_unsigned("first_pinned", get_first_pinned());
+    f->dump_unsigned("last_pinned", get_last_pinned());
+    f->open_array_section("pinned_maps");
+    for (auto& i : pinned) {
+      f->dump_unsigned("epoch", i);
+    }
+    f->close_section();
+ }
 };
 WRITE_CLASS_ENCODER(osdmap_manifest_t);