mon: Have 'ceph report' print last committed versions

Only for those services that weren't doing it.

Backport: dumpling
Backport: emperor

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index b49bf097bd4113f91a7950616142edb466e980df..fe4ba693de99588b7798a4849a521ea0fd859658 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -550,6 +550,7 @@ void MDSMonitor::dump_info(Formatter *f)
   f->close_section();
 
   f->dump_unsigned("mdsmap_first_committed", get_first_committed());
+  f->dump_unsigned("mdsmap_last_committed", get_last_committed());
 }
 
 bool MDSMonitor::preprocess_command(MMonCommand *m)

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index ca855592445f1aab66da50391b8f8cbcf652bc2d..4011e2bf3baaa7090e3d1ed6f072e81ceb887c10 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -138,6 +138,7 @@ bool MonmapMonitor::preprocess_query(PaxosServiceMessage *m)
 void MonmapMonitor::dump_info(Formatter *f)
 {
   f->dump_unsigned("monmap_first_committed", get_first_committed());
+  f->dump_unsigned("monmap_last_committed", get_last_committed());
   f->open_object_section("monmap");
   mon->monmap->dump(f);
   f->close_section();

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 058a5cfeef3a3f56825f3f74444e914299abf171..9b1631828a8a25fd38504e3d4e33bb307fd13f58 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1963,6 +1963,7 @@ void OSDMonitor::dump_info(Formatter *f)
   f->close_section();
 
   f->dump_unsigned("osdmap_first_committed", get_first_committed());
+  f->dump_unsigned("osdmap_last_committed", get_last_committed());
 
   f->open_object_section("crushmap");
   osdmap.crush->dump(f);

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index 0ba7970a0c5045723c477a4185c569207d1d440c..4310dd05a2b7210fafe89f92663b9e4635e733f5 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -1339,6 +1339,7 @@ void PGMonitor::dump_info(Formatter *f)
   f->close_section();
 
   f->dump_unsigned("pgmap_first_committed", get_first_committed());
+  f->dump_unsigned("pgmap_last_committed", get_last_committed());
 }
 
 bool PGMonitor::preprocess_command(MMonCommand *m)