From 4042bec19dbb477d032a9b964da949aa952cc6d1 Mon Sep 17 00:00:00 2001
From: Patrick Donnelly <pdonnell@redhat.com>
Date: Thu, 11 Jan 2018 14:46:32 -0800
Subject: [PATCH] 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>
---
 src/mgr/DaemonServer.cc | 2 +-
 src/mgr/Mgr.cc          | 2 +-
 src/mon/MDSMonitor.cc   | 2 +-
 src/mon/MonCommands.h   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc
index d4ab6fd1a3460..6c2f007a94bda 100644
--- 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 de0933da3d37d..eed2bae72007d 100644
--- 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 53bac5d8ce87b..89a66a3c96678 100644
--- 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 de5e7f06807c3..0f1729d4f9a2f 100644
--- 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",
-- 
2.39.5