diff options
| author | Dan Mick <dan.mick@inktank.com> | 2013-08-06 18:33:38 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-08-07 08:29:17 -0700 |
| commit | afa21e80741fb6765f8a602daa08a60f1f2d768d (patch) | |
| tree | bd4503d0e76f34ca18520ffbc2c2e5bb0c60969a | |
| parent | fb06bf60c19709e0248c8bb485f26ea0175a1927 (diff) | |
| download | ceph-afa21e80741fb6765f8a602daa08a60f1f2d768d.tar.gz | |
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>
| -rw-r--r-- | src/mon/MonCommands.h | 4 | ||||
| -rw-r--r-- | src/mon/OSDMonitor.cc | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index aa7b8959f06..583203b7448 100644 --- 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 f86b17f5e10..07022aec73b 100644 --- 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 ** |