From: Joao Eduardo Luis <joao.luis@inktank.com>
Date: Mon, 9 Sep 2013 22:14:11 +0000 (+0100)
Subject: mon: MonCommands: expect a CephString as 1st arg for 'osd crush move'
X-Git-Tag: v0.69~7^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F582%2Fhead;p=ceph.git

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 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);