From: Kefu Chai <kchai@redhat.com>
Date: Fri, 27 Sep 2019 07:44:06 +0000 (+0800)
Subject: mon/OSDMonitor: do not handle "osd set/unset" full
X-Git-Tag: v15.1.0~1333^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4ecb5dccbd8945447d1947f3aec4da4ab47995bc;p=ceph.git

mon/OSDMonitor: do not handle "osd set/unset" full

this flag is not honored by client or cluster anymore

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

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 01ddacc28c28..31608ce1e61c 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 119bad4f71c5..fbd231c06119 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);