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 01ddacc28c2868505247b46f334c6d12191cd41f..31608ce1e61c2d79beac354244b637a053c84cb8 100755 (executable)
--- 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 119bad4f71c5db9158789689732fe94b80b53e08..fbd231c06119dac28f07d3133b6b171760761036 100644 (file)
--- 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);