RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 08:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20866 from jan--f/mgr-fix-metadata-return

Browse Source 
mon/MonCommands: mgr metadata - improve parameter naming consistency

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: John Spray <john.spray@redhat.com>
This commit is contained in:
Kefu Chai 2018-04-07 17:31:04 +08:00 committed by GitHub
commit 8d87f1c055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mon/MgrMonitor.cc
View File

@ -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

2
src/mon/MonCommands.h
View File

@ -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",