From b64122ac371902a8b792a3faf0e6679978c9a125 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Thu, 23 Nov 2017 17:18:39 +0000 Subject: [PATCH] mon/OSDMonitor: dump osdmap manifest alongside other infos Signed-off-by: Joao Eduardo Luis --- src/mon/OSDMonitor.cc | 6 ++++++ src/mon/OSDMonitor.h | 9 +++++++++ 2 files changed, 15 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 909b21442a4f5..7ef7301ea1830 100644 --- 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 435f1d70c9b3c..6fde3ac7b0c7e 100644 --- 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); -- 2.39.5