mon: Monitor: s/get_status()/get_cluster_status()/

Monitor::get_status() is actually used to obtain 'cluster status' (i.e.,
status about *all* the monitors, maps, IO, overall healthiness).

Just make that clear in the function name, avoiding confusion between
multiple 'status-related' functions in the monitor.

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

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index dac9c3efe8384e2586a6331b8d2f136e1b947112..69b32a5229dd738459883ae34b0431218deb1137 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -1941,7 +1941,7 @@ void Monitor::get_health(string& status, bufferlist *detailbl, Formatter *f)
     f->close_section();
 }
 
-void Monitor::get_status(stringstream &ss, Formatter *f)
+void Monitor::get_cluster_status(stringstream &ss, Formatter *f)
 {
   if (f)
     f->open_object_section("status");
@@ -2283,8 +2283,8 @@ void Monitor::handle_command(MMonCommand *m)
     cmd_getval(g_ceph_context, cmdmap, "detail", detail);
 
     if (prefix == "status") {
-      // get_status handles f == NULL
-      get_status(ds, f.get());
+      // get_cluster_status handles f == NULL
+      get_cluster_status(ds, f.get());
 
       if (f) {
         f->flush(ds);

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index e8828a1646448a57b2cbfc805c05ce672e80b9b2..65b57053ecbffcb79eb12394b5ba1262653740ff 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -632,7 +632,7 @@ public:
    * @param detailbl optional bufferlist* to fill with a detailed report
    */
   void get_health(string& status, bufferlist *detailbl, Formatter *f);
-  void get_status(stringstream &ss, Formatter *f);
+  void get_cluster_status(stringstream &ss, Formatter *f);
 
   void reply_command(MMonCommand *m, int rc, const string &rs, version_t version);
   void reply_command(MMonCommand *m, int rc, const string &rs, bufferlist& rdata, version_t version);