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

mon: Monitor: use 'ceph mon metadata' instead of 'ceph mon_metadata'

Browse Source 
'ceph mon_metadata' was added still during this dev cycle, so there is
no need to deprecate it first.

Fixes: #11545

Signed-off-by: Joao Eduardo Luis <joao@suse.de>
This commit is contained in:
Joao Eduardo Luis 2015-05-12 14:59:11 +01:00
parent 955dcede2a
commit 038452e70f
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PendingReleaseNotes
View File

@ -8,3 +8,7 @@ v9.0.4
* 'ceph scrub', 'ceph compact' and 'ceph sync force are now DEPRECATED. Users
should instead use 'ceph mon scrub', 'ceph mon compact' and
'ceph mon sync force'.
* 'ceph mon_metadata' should now be used as 'ceph mon metadata'. There is no
need to deprecate this command (same major release since it was first
introduced).

2
qa/workunits/cephtool/test.sh
View File

@ -578,7 +578,7 @@ function test_mon_misc()
ceph log "$mymsg"
ceph_watch_wait "$mymsg"
ceph mon_metadata a
ceph mon metadata a
ceph node ls
}

6
src/mon/MonCommands.h
View File

@ -246,9 +246,6 @@ COMMAND("report name=tags,type=CephString,n=N,req=false", \
"mon", "r", "cli,rest")
COMMAND("quorum_status", "report status of monitor quorum", \
"mon", "r", "cli,rest")
COMMAND("mon_metadata name=id,type=CephString",
"fetch metadata for mon <id>",
"mon", "r", "cli,rest")
COMMAND_WITH_FLAG("mon_status", "report status of monitors", "mon", "r", "cli,rest",
FLAG(NOFORWARD))
@ -291,6 +288,9 @@ COMMAND_WITH_FLAG("mon sync force " \
"force sync of and clear monitor store", \
"mon", "rw", "cli,rest", \
FLAG(NOFORWARD))
COMMAND("mon metadata name=id,type=CephString",
"fetch metadata for mon <id>",
"mon", "r", "cli,rest")
/*

7
src/mon/Monitor.cc
View File

@ -291,7 +291,7 @@ void Monitor::do_admin_command(string command, cmdmap_t& cmdmap, string format,
args = "[" + args + "]";
bool read_only = (command == "mon_status" ||
command == "mon_metadata" ||
command == "mon metadata" ||
command == "quorum_status");
(read_only ? audit_clog->debug() : audit_clog->info())
@ -2700,7 +2700,8 @@ void Monitor::handle_command(MMonCommand *m)
*/
prefix != "mon compact" &&
prefix != "mon scrub" &&
prefix != "mon sync force") {
prefix != "mon sync force" &&
prefix != "mon metadata") {
monmon()->dispatch(m);
return;
}
@ -2887,7 +2888,7 @@ void Monitor::handle_command(MMonCommand *m)
rdata.append(ds);
rs = "";
r = 0;
} else if (prefix == "mon_metadata") {
} else if (prefix == "mon metadata") {
string name;
cmd_getval(g_ceph_context, cmdmap, "id", name);
int mon = monmap->get_rank(name);