diff options
| author | Sage Weil <sage@inktank.com> | 2013-09-09 16:01:06 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-09-09 16:01:06 -0700 |
| commit | a5a3510ea8def905af86ce64a10949f6c3d13b04 (patch) | |
| tree | 2a72c4f5909d75867b954358ec213556b3ddc7f1 | |
| parent | bc552647d4765a9c4ba08f1336059be498e0875b (diff) | |
| parent | 7d3799fde19138f957f26ec6be10a8a0000fc1f0 (diff) | |
| download | ceph-a5a3510ea8def905af86ce64a10949f6c3d13b04.tar.gz | |
Merge pull request #582 from ceph/wip-6230
mon: MonCommands: expect a CephString as 1st arg for 'osd crush move'
Reviewed-by: Sage Weil <sage@inktank.com>
| -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 28fa80e00b7..baef4ea50a5 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -384,7 +384,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 ede5f165b53..85dcf576271 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2825,6 +2825,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); |