mon: revert mds metadata argument name change

Partial revert of PR #18512: d1877b68d90163897245a9801cff0ea419ff28e4

Fixes: http://tracker.ceph.com/issues/22527
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index d4ab6fd1a3460595366bd0ee183ce66b5c802f65..6c2f007a94bda7b9418e771a54a4c7497c050c8c 100644 (file)
--- a/src/mgr/DaemonServer.cc
+++ b/src/mgr/DaemonServer.cc
@@ -436,7 +436,7 @@ bool DaemonServer::handle_report(MMgrReport *m)
 
       } else if (key.first == "mds") {
         c->set_default("addr", stringify(m->get_source_addr()));
-        oss << "{\"prefix\": \"mds metadata\", \"role\": \""
+        oss << "{\"prefix\": \"mds metadata\", \"who\": \""
             << key.second << "\"}";
  
       } else {

diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc
index de0933da3d37d52763f0ae0ca0c5c55372586796..eed2bae72007db9131a2a143f091e3efc016df0a 100644 (file)
--- a/src/mgr/Mgr.cc
+++ b/src/mgr/Mgr.cc
@@ -567,7 +567,7 @@ void Mgr::handle_fs_map(MFSMap* m)
       c->set_default("addr", stringify(info.addr));
 
       std::ostringstream cmd;
-      cmd << "{\"prefix\": \"mds metadata\", \"role\": \""
+      cmd << "{\"prefix\": \"mds metadata\", \"who\": \""
           << info.name << "\"}";
       monc->start_mon_command(
           {cmd.str()},

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 53bac5d8ce87b07ce5e9a8905df62d1b1cf0220c..89a66a3c966780dbff737b0570ff86a5bab888f6 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -912,7 +912,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op)
       f.reset(Formatter::create("json-pretty"));
 
     string who;
-    bool all = !cmd_getval(g_ceph_context, cmdmap, "role", who);
+    bool all = !cmd_getval(g_ceph_context, cmdmap, "who", who);
     dout(1) << "all = " << all << dendl;
     if (all) {
       r = 0;

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index de5e7f06807c3b19bd0b987d28ff882459c0a22e..0f1729d4f9a2fb44bcbd47f11ad6ace747a6e34c 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -291,7 +291,7 @@ COMMAND("fs dump "
 COMMAND_WITH_FLAG("mds getmap " \
        "name=epoch,type=CephInt,req=false,range=0", \
        "get MDS map, optionally from epoch", "mds", "r", "cli,rest", FLAG(OBSOLETE))
-COMMAND("mds metadata name=role,type=CephString,req=false",
+COMMAND("mds metadata name=who,type=CephString,req=false",
        "fetch metadata for mds <role>",
        "mds", "r", "cli,rest")
 COMMAND("mds count-metadata name=property,type=CephString",