From: Sage Weil <sage@redhat.com>
Date: Mon, 3 Apr 2017 16:46:32 +0000 (-0400)
Subject: mgr: move 'osd perf' and 'osd blocked-by' to mgr
X-Git-Tag: v12.0.2~187^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd4ba40b9e3938fcdf7f9d24bc6d471e96b5bd80;p=ceph.git

mgr: move 'osd perf' and 'osd blocked-by' to mgr

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mgr/MgrCommands.h b/src/mgr/MgrCommands.h
index 6a407f4e6691..f55161589a14 100644
--- a/src/mgr/MgrCommands.h
+++ b/src/mgr/MgrCommands.h
@@ -54,3 +54,13 @@ COMMAND("pg deep-scrub name=pgid,type=CephPgid", "start deep-scrub on <pgid>", \
 	"pg", "rw", "cli,rest")
 COMMAND("pg repair name=pgid,type=CephPgid", "start repair on <pgid>", \
 	"pg", "rw", "cli,rest")
+
+// stuff in osd namespace
+COMMAND("osd perf", \
+        "print dump of OSD perf summary stats", \
+        "osd", \
+        "r", \
+        "cli,rest")
+COMMAND("osd blocked-by", \
+	"print histogram of which OSDs are blocking their peers", \
+	"osd", "r", "cli,rest")
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 6e0e70ddecfa..8dc9f511dab8 100644
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -428,14 +428,6 @@ COMMAND("osd getmap " \
 COMMAND("osd getcrushmap " \
 	"name=epoch,type=CephInt,range=0,req=false", \
 	"get CRUSH map", "osd", "r", "cli,rest")
-COMMAND("osd perf", \
-        "print dump of OSD perf summary stats", \
-        "osd", \
-        "r", \
-        "cli,rest")
-COMMAND("osd blocked-by", \
-	"print histogram of which OSDs are blocking their peers", \
-	"osd", "r", "cli,rest")
 COMMAND("osd getmaxosd", "show largest OSD id", "osd", "r", "cli,rest")
 COMMAND("osd find " \
 	"name=id,type=CephOsdName", \