mgr mon: Expose network ping information except for python pg_dump

Caused by: ffb8a2a904426c8a3d6fc2fd70266418a98623c5

Signed-off-by: David Zafman <dzafman@redhat.com>

diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc
index e30da4cb0dd27085052925562e639f2ee39ee49e..b29a61459d8d3584245d45c11fa28d30a5c72fcc 100644 (file)
--- a/src/mgr/ActivePyModules.cc
+++ b/src/mgr/ActivePyModules.cc
@@ -323,7 +323,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 9fafca5c632893bb72640d8223e6f7965dea790b..80b1a2937dda1a302d6274608dccb0092d460388 100644 (file)
--- a/src/mon/PGMap.cc
+++ b/src/mon/PGMap.cc
@@ -1527,12 +1527,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 f40396d324c31f74995b2a86a43ec87d9a5187fc..11ba7613698602bf7af3c16615af5c1a4e592b4f 100644 (file)
--- a/src/mon/PGMap.h
+++ b/src/mon/PGMap.h
@@ -439,11 +439,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,