From 7d3799fde19138f957f26ec6be10a8a0000fc1f0 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Mon, 9 Sep 2013 23:14:11 +0100 Subject: mon: MonCommands: expect a CephString as 1st arg for 'osd crush move' Fixes: #6230 Signed-off-by: Joao Eduardo Luis --- src/mon/MonCommands.h | 2 +- src/mon/OSDMonitor.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 at/to location ", \ "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 to location ", \ "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 argvec; + cmd_getval(g_ceph_context, cmdmap, "name", name); cmd_getval(g_ceph_context, cmdmap, "args", argvec); map loc; parse_loc_map(argvec, &loc); -- cgit v1.2.1