mon: mark "scrub" commands obsolete

"scrub" was marked deprecated in
1814d7441bbb53a3d99c7a779a68b8f5e84fd169. this commit
was in turn included by v10.0.0. so it's long enough for its
retirement.

the test is updated accordingly

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index d30fb3badae11e81321e92fe8a387a27b0f589b1..a297ac2ebbbd42e9f4c3175dde35d888ae71a3aa 100755 (executable)
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -2578,7 +2578,6 @@ function test_mon_deprecated_commands()
 {
   # current DEPRECATED commands are:
   #  ceph compact
-  #  ceph scrub
   #
   # Testing should be accomplished by setting
   # 'mon_debug_deprecated_as_obsolete = true' and expecting ENOTSUP for
@@ -2588,7 +2587,7 @@ function test_mon_deprecated_commands()
   expect_false ceph compact 2> $TMPFILE
   check_response "\(EOPNOTSUPP\|ENOTSUP\): command is obsolete"
 
-  expect_false ceph scrub 2> $TMPFILE
+  expect_false ceph config-key list 2> $TMPFILE
   check_response "\(EOPNOTSUPP\|ENOTSUP\): command is obsolete"
 
   ceph tell mon.* injectargs '--no-mon-debug-deprecated-as-obsolete'

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 89eacf6d9bb58a2dfcb9b16997bd16b31480fb63..01cf5ffd6a772b4e27e53c7f73cc586f2693debb 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -193,7 +193,7 @@ COMMAND_WITH_FLAG("compact", "cause compaction of monitor's leveldb/rocksdb stor
              FLAG(NOFORWARD)|FLAG(DEPRECATED))
 COMMAND_WITH_FLAG("scrub", "scrub the monitor stores",
              "mon", "rw",
-             FLAG(DEPRECATED))
+             FLAG(OBSOLETE))
 COMMAND("fsid", "show cluster FSID/UUID", "mon", "r")
 COMMAND("log name=logtext,type=CephString,n=N",
        "log supplied text to the monitor log", "mon", "rw")

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 8566ea0c46410a5795bac33d99071f19a7b82613..da97d4300ed42fb10e0d4c8182a13bb9c8084952 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3449,7 +3449,7 @@ void Monitor::handle_command(MonOpRequestRef op)
     return;
   }
 
-  if (prefix == "scrub" || prefix == "mon scrub") {
+  if (prefix == "mon scrub") {
     wait_for_paxos_write();
     if (is_leader()) {
       int r = scrub_start();