diff options
| author | Joao Eduardo Luis <joao.luis@inktank.com> | 2013-09-09 23:14:11 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-23 16:29:07 -0700 |
| commit | 471233e98a9f64ad513a4a196b7661b80534cb00 (patch) | |
| tree | 06a752eaa2495e38568650470d0908f79bebaf50 | |
| parent | 2908225092bd2aa1b8afcb7848c1cdac5bd9e638 (diff) | |
| download | ceph-471233e98a9f64ad513a4a196b7661b80534cb00.tar.gz | |
mon: MonCommands: expect a CephString as 1st arg for 'osd crush move'
Fixes: #6230
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 7d3799fde19138f957f26ec6be10a8a0000fc1f0)
| -rw-r--r-- | src/mon/MonCommands.h | 2 | ||||
| -rw-r--r-- | src/mon/OSDMonitor.cc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 8e9c2bb333b..89097f3b533 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -379,7 +379,7 @@ COMMAND("osd crush create-or-move " \ "create entry or move existing entry for <name> <weight> at/to location <args>", \ "osd", "rw", "cli,rest") COMMAND("osd crush move " \ - "name=id,type=CephOsdName " \ + "name=name,type=CephString,goodchars=[A-Za-z0-9-_.] " \ "name=args,type=CephString,n=N,goodchars=[A-Za-z0-9-_.=]", \ "move existing entry for <name> to location <args>", \ "osd", "rw", "cli,rest") diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 5339472f873..af4f62d9c58 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2796,6 +2796,7 @@ bool OSDMonitor::prepare_command(MMonCommand *m) string args; vector<string> argvec; + cmd_getval(g_ceph_context, cmdmap, "name", name); cmd_getval(g_ceph_context, cmdmap, "args", argvec); map<string,string> loc; parse_loc_map(argvec, &loc); |