mgr mon: Expose network ping information except for python pg_dump

Caused by: ffb8a2a904426c8a3d6fc2fd70266418a98623c5

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 1112584621016c4a8cac1bedb1a1b8b17c394f7f)

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index 0dae47fa2c39f459a3f0b558ffaa6a8b9288ab36..460b337ca0777c460e7bf52970305de216fa5a2a 100644 (file)
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -312,7 +312,7 @@ PyObject *ActivePyModules::get_python(const std::string &what)
     cluster_state.with_pgmap(
       [&f, &tstate](const PGMap &pg_map) {
         PyEval_RestoreThread(tstate);
-       pg_map.dump(&f);
+       pg_map.dump(&f, false);
       }
     );
     return f.get();

diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc
index 97630f7a0d3e32f331eeb7dca59c23108815fad5..a56d7d99b01014bbf92e4c462a8904da8390a590 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1495,12 +1495,12 @@ void PGMap::decode(bufferlist::const_iterator &bl)
   calc_stats();
 }
 
-void PGMap::dump(ceph::Formatter *f) const
+void PGMap::dump(ceph::Formatter *f, bool with_net) const
 {
   dump_basic(f);
   dump_pg_stats(f, false);
   dump_pool_stats(f);
-  dump_osd_stats(f);
+  dump_osd_stats(f, with_net);
 }
 
 void PGMap::dump_basic(ceph::Formatter *f) const

diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h
index 79f1bfee01f7cf59cb60e3abadcf15afc9dac706..f85e3c601d2a3bf7cc964130fa97b2fd9c913f3d 100644 (file)
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -434,11 +434,11 @@ public:
   int64_t get_rule_avail(const OSDMap& osdmap, int ruleno) const;
   void get_rules_avail(const OSDMap& osdmap,
                       std::map<int,int64_t> *avail_map) const;
-  void dump(ceph::Formatter *f) const; 
+  void dump(ceph::Formatter *f, bool with_net = true) const;
   void dump_basic(ceph::Formatter *f) const;
   void dump_pg_stats(ceph::Formatter *f, bool brief) const;
   void dump_pool_stats(ceph::Formatter *f) const;
-  void dump_osd_stats(ceph::Formatter *f, bool with_net = false) const;
+  void dump_osd_stats(ceph::Formatter *f, bool with_net = true) const;
   void dump_delta(ceph::Formatter *f) const;
   void dump_filtered_pg_stats(ceph::Formatter *f, std::set<pg_t>& pgs) const;
   void dump_pool_stats_full(const OSDMap &osd_map, std::stringstream *ss,