mgr: expose a MgrMap in PyModules

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

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index 9c9ea5d82d304acb919442fa75076162666e9063..aa4cc6a7f7b001c5e8643210de023c1a36bf4c34 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -599,7 +599,9 @@ bool Mgr::got_mgr_map(const MgrMap& m)
         << dendl;
     return true;
   }
+
   cluster_state.set_mgr_map(m);
+
   return false;
 }
 

diff --git a/src/mgr/Mgr.h b/src/mgr/Mgr.h
index fd96a20b6be6cdbacb91314e6aa1b91f9823fd0a..ccf22da9e7c4e91472f04414880e33efd6060c09 100644 (file)
--- a/src/mgr/Mgr.h
+++ b/src/mgr/Mgr.h
@@ -29,6 +29,7 @@
 #include "auth/Auth.h"
 #include "common/Finisher.h"
 #include "common/Timer.h"
+#include "mon/MgrMap.h"
 
 #include "DaemonServer.h"
 #include "PyModules.h"

diff --git a/src/mgr/PyModules.cc b/src/mgr/PyModules.cc
index 113dd665d9c4a1b2837147e61cd3c3d84ee9fb08..8412e6cbf5fff238131fcda3065a2d60806f8bc0 100644 (file)
--- a/src/mgr/PyModules.cc
+++ b/src/mgr/PyModules.cc
@@ -281,6 +281,12 @@ PyObject *PyModules::get_python(const std::string &what)
     }
     f.dump_string("json", json.to_str());
     return f.get();
+  } else if (what == "mgr_map") {
+    PyFormatter f;
+    cluster_state.with_mgrmap([&f](const MgrMap &mgr_map) {
+      mgr_map.dump(&f);
+    });
+    return f.get();
   } else {
     derr << "Python module requested unknown data '" << what << "'" << dendl;
     Py_RETURN_NONE;

diff --git a/src/mgr/PyModules.h b/src/mgr/PyModules.h
index 8e52e173062ae2f1c5f539a2193ef0fba4bbf532..467555b51a1feca1111631340c1fb08de296e606 100644 (file)
--- a/src/mgr/PyModules.h
+++ b/src/mgr/PyModules.h
@@ -23,6 +23,7 @@
 #include "osdc/Objecter.h"
 #include "client/Client.h"
 #include "common/LogClient.h"
+#include "mon/MgrMap.h"
 
 #include "DaemonState.h"
 #include "ClusterState.h"