From: Jan Fajerski <jfajerski@suse.com>
Date: Tue, 13 Mar 2018 11:53:18 +0000 (+0100)
Subject: mon/MgrMonitor: daemon id is under who in cmdmap, return name not id
X-Git-Tag: v13.1.0~375^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=428236de8b4155beffb5a4ffa8dd206230325a01;p=ceph.git

mon/MgrMonitor: daemon id is under who in cmdmap, return name not id

Fixes: http://tracker.ceph.com/issues/23330

Signed-off-by: Jan Fajerski <jfajerski@suse.com>
---

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index 5fb8bdddf30c..a32c8bda43c1 100644
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -739,7 +739,7 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op)
     f->flush(rdata);
   } else if (prefix == "mgr metadata") {
     string name;
-    cmd_getval(g_ceph_context, cmdmap, "id", name);
+    cmd_getval(g_ceph_context, cmdmap, "who", name);
     if (name.size() > 0 && !map.have_name(name)) {
       ss << "mgr." << name << " does not exist";
       r = -ENOENT;
@@ -750,7 +750,7 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op)
     boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
     if (name.size()) {
       f->open_object_section("mgr_metadata");
-      f->dump_string("id", name);
+      f->dump_string("name", name);
       r = dump_metadata(name, f.get(), &ss);
       if (r < 0)
         goto reply;
@@ -760,7 +760,7 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op)
       f->open_array_section("mgr_metadata");
       for (auto& i : map.get_all_names()) {
 	f->open_object_section("mgr");
-	f->dump_string("id", i);
+	f->dump_string("name", i);
 	r = dump_metadata(i, f.get(), NULL);
 	if (r == -EINVAL || r == -ENOENT) {
 	  // Drop error, continue to get other daemons' metadata
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 78fbf08ad54f..4657adf13468 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -1087,7 +1087,7 @@ COMMAND("mgr module enable "						\
 COMMAND("mgr module disable "						\
 	"name=module,type=CephString",
 	"disable mgr module", "mgr", "rw", "cli,rest")
-COMMAND("mgr metadata name=id,type=CephString,req=false",
+COMMAND("mgr metadata name=who,type=CephString,req=false",
 	"dump metadata for all daemons or a specific daemon",
 	"mgr", "r", "cli,rest")
 COMMAND("mgr count-metadata name=property,type=CephString",