]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: drop --force for use_gmt_hitset
authorSage Weil <sage@redhat.com>
Wed, 25 Oct 2017 21:21:34 +0000 (16:21 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Oct 2017 13:30:44 +0000 (08:30 -0500)
This is supported by all >= luminous OSDs, so this guard is not needed.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc

index f87bba81d043df8d656693841035a48c63950808..4d2e34a14dee58369e9db09ee357ecad120733ef 100644 (file)
@@ -5900,18 +5900,6 @@ int OSDMonitor::prepare_command_pool_set(map<string,cmd_vartype> &cmdmap,
     bloomp->set_fpp(f);
   } else if (var == "use_gmt_hitset") {
     if (val == "true" || (interr.empty() && n == 1)) {
-      string force;
-      cmd_getval(cct, cmdmap, "force", force);
-      if (!osdmap.get_num_up_osds() && force != "--yes-i-really-mean-it") {
-        ss << "Not advisable to continue since no OSDs are up. Pass "
-           << "--yes-i-really-mean-it if you really wish to continue.";
-        return -EPERM;
-      }
-      if (!(osdmap.get_up_osd_features() & CEPH_FEATURE_OSD_HITSET_GMT)
-          && force != "--yes-i-really-mean-it") {
-       ss << "not all OSDs support GMT hit set.";
-       return -EINVAL;
-      }
       p.use_gmt_hitset = true;
     } else {
       ss << "expecting value 'true' or '1'";