From 4ecb5dccbd8945447d1947f3aec4da4ab47995bc Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 27 Sep 2019 15:44:06 +0800 Subject: [PATCH] mon/OSDMonitor: do not handle "osd set/unset" full this flag is not honored by client or cluster anymore Signed-off-by: Kefu Chai --- qa/workunits/cephtool/test.sh | 2 +- src/mon/OSDMonitor.cc | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh index 01ddacc28c2..31608ce1e61 100755 --- a/qa/workunits/cephtool/test.sh +++ b/qa/workunits/cephtool/test.sh @@ -1477,7 +1477,7 @@ function test_mon_osd() done for f in noup nodown noin noout noscrub nodeep-scrub nobackfill \ - norebalance norecover notieragent full + norebalance norecover notieragent do ceph osd set $f ceph osd unset $f diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 119bad4f71c..fbd231c0611 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -11004,9 +11004,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, string key; cmd_getval(cct, cmdmap, "key", key); - if (key == "full") - return prepare_set_flag(op, CEPH_OSDMAP_FULL); - else if (key == "pause") + if (key == "pause") return prepare_set_flag(op, CEPH_OSDMAP_PAUSERD | CEPH_OSDMAP_PAUSEWR); else if (key == "noup") return prepare_set_flag(op, CEPH_OSDMAP_NOUP); @@ -11056,9 +11054,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd unset") { string key; cmd_getval(cct, cmdmap, "key", key); - if (key == "full") - return prepare_unset_flag(op, CEPH_OSDMAP_FULL); - else if (key == "pause") + if (key == "pause") return prepare_unset_flag(op, CEPH_OSDMAP_PAUSERD | CEPH_OSDMAP_PAUSEWR); else if (key == "noup") return prepare_unset_flag(op, CEPH_OSDMAP_NOUP);