mon: MonCommands: expect a CephString as 1st arg for 'osd crush move'

Fixes: #6230
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 28fa80e00b798989fd1d8cc63d211c2a09533563..baef4ea50a5baa913097415efa4879f8d2cf19fc 100644 (file)
--- 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 ede5f165b539e6c7aeacf285d65a5669d065db5e..85dcf576271bc9bec92e8b9c515e36cd4e6d5098 100644 (file)
--- 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);