mgr: expose "df" to python modules

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mgr/ClusterState.h b/src/mgr/ClusterState.h
index bd9ee4d06dd4b2f1c6f6a3b2718cb86580f5bd4e..c63ca27604c42a04c36bba48f9e2340646356109 100644 (file)
--- a/src/mgr/ClusterState.h
+++ b/src/mgr/ClusterState.h
@@ -98,7 +98,6 @@ public:
   template<typename Callback, typename...Args>
   void with_osdmap(Callback&& cb, Args&&...args)
   {
-    Mutex::Locker l(lock);
     assert(objecter != nullptr);
     objecter->with_osdmap(cb);
   }

diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc
index 1cc610c20d24b0fa0bbaabe14a4c5e1403bce2e1..3f32934f707a5aef59f3a12baa338c6ac1f3049b 100644 (file)
--- a/src/mgr/MgrClient.cc
+++ b/src/mgr/MgrClient.cc
@@ -336,3 +336,4 @@ bool MgrClient::handle_command_reply(MCommandReply *m)
   m->put();
   return true;
 }
+

diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc
index e7147e736bb90c57298b36f3df4d59f243a84ef1..4cbaccfae7aa5dd98880fa6f4d984ed40a0b2fe9 100644 (file)
--- a/src/mgr/PyModules.cc
+++ b/src/mgr/PyModules.cc
@@ -177,7 +177,6 @@ PyObject *PyModules::get_python(const std::string &what)
     PyFormatter f;
     cluster_state.with_pgmap(
         [&f](const PGMap &pg_map) {
-      //    f.open_object_section("outer");
           std::map<std::string, std::map<std::string, uint32_t> > osds;
           std::map<std::string, std::map<std::string, uint32_t> > pools;
           std::map<std::string, uint32_t> all;
@@ -214,11 +213,21 @@ PyObject *PyModules::get_python(const std::string &what)
             f.dump_int(i.first.c_str(), i.second);
           }
           f.close_section();
-      //    f.close_section();
         }
     );
     return f.get();
 
+  } else if (what == "df") {
+    PyFormatter f;
+
+    cluster_state.with_osdmap([this, &f](const OSDMap &osd_map){
+      cluster_state.with_pgmap(
+          [osd_map, &f](const PGMap &pg_map) {
+        pg_map.dump_fs_stats(nullptr, &f, true);
+        pg_map.dump_pool_stats(osd_map, nullptr, &f, true);
+      });
+    });
+    return f.get();
   } else if (what == "health" || what == "mon_status") {
     PyFormatter f;
     bufferlist json;