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 6a407f4e66912af81a5aecf615a2f754c851b94c..f55161589a14bec7061e535393d82066d173520c 100644 (file)
--- 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 6e0e70ddecfa1562b9b5ada4c2524ed9db910799..8dc9f511dab8b6db34a51c415fba04a0ad218159 100644 (file)
--- 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", \