RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-31 07:53:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: mark "scrub" commands obsolete

Browse Source 
"scrub" was marked deprecated in
1814d7441b. 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>
This commit is contained in:
Kefu Chai 2019-11-19 11:49:23 +08:00
parent 946f154f4d
commit e9a5ce0897
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
qa/workunits/cephtool/test.sh
View File

@ -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'

2
src/mon/MonCommands.h
View File

@ -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")

2
src/mon/Monitor.cc
View File

@ -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();