Add back the mistakenly removed "ceph osd set noscrub/nodeep-scrub"

Fixes: #5868
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index aa7b8959f06ec047c1d197c35ce8e8b42439d2cb..583203b74489629b94c5882ec0779f24d5ac00ad 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -427,10 +427,10 @@ COMMAND("osd setmaxosd " \
 COMMAND("osd pause", "pause osd", "osd", "rw", "cli,rest")
 COMMAND("osd unpause", "unpause osd", "osd", "rw", "cli,rest")
 COMMAND("osd set " \
-       "name=key,type=CephChoices,strings=pause|noup|nodown|noout|noin|nobackfile|norecover", \
+       "name=key,type=CephChoices,strings=pause|noup|nodown|noout|noin|nobackfile|norecover|noscrub|nodeep-scrub", \
        "set <key>", "osd", "rw", "cli,rest")
 COMMAND("osd unset " \
-       "name=key,type=CephChoices,strings=pause|noup|nodown|noout|noin|nobackfile|norecover", \
+       "name=key,type=CephChoices,strings=pause|noup|nodown|noout|noin|nobackfile|norecover|noscrub|nodeep-scrub", \
        "unset <key>", "osd", "rw", "cli,rest")
 COMMAND("osd cluster_snap", "take cluster snapshot (disabled)", \
        "osd", "r", "")

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index f86b17f5e104931f805a7e0f38f328f793bbdba3..07022aec73b425878235800aeaf3bb5c72e6696a 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3071,6 +3071,10 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
       return prepare_set_flag(m, CEPH_OSDMAP_NOBACKFILL);
     else if (key == "norecover")
       return prepare_set_flag(m, CEPH_OSDMAP_NORECOVER);
+    else if (key == "noscrub")
+      return prepare_set_flag(m, CEPH_OSDMAP_NOSCRUB);
+    else if (key == "nodeep-scrub")
+      return prepare_set_flag(m, CEPH_OSDMAP_NODEEP_SCRUB);
 
   } else if (prefix == "osd unset") {
     string key;
@@ -3089,6 +3093,10 @@ bool OSDMonitor::prepare_command(MMonCommand *m)
       return prepare_unset_flag(m, CEPH_OSDMAP_NOBACKFILL);
     else if (key == "norecover")
       return prepare_unset_flag(m, CEPH_OSDMAP_NORECOVER);
+    else if (key == "noscrub")
+      return prepare_unset_flag(m, CEPH_OSDMAP_NOSCRUB);
+    else if (key == "nodeep-scrub")
+      return prepare_unset_flag(m, CEPH_OSDMAP_NODEEP_SCRUB);
 
   } else if (prefix == "osd cluster_snap") {
     // ** DISABLE THIS FOR NOW **