mon: remove config option to disable no sortbitwise warning

We'll require this soon.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 04e3319e8aecde9ca58ccb7c89016f9079c7d657)

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 80cf3731940f26a51e5d21d0fae1ddb2eae5d20c..1f65392b748d1975341af0a828bd71bd4140c66b 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -273,7 +273,6 @@ OPTION(mon_crush_min_required_version, OPT_STR, "firefly")
 OPTION(mon_warn_on_crush_straw_calc_version_zero, OPT_BOOL, true) // warn if crush straw_calc_version==0
 OPTION(mon_warn_on_osd_down_out_interval_zero, OPT_BOOL, true) // warn if 'mon_osd_down_out_interval == 0'
 OPTION(mon_warn_on_cache_pools_without_hit_sets, OPT_BOOL, true)
-OPTION(mon_warn_on_no_sortbitwise, OPT_BOOL, true)  // warn when sortbitwise not set
 OPTION(mon_min_osdmap_epochs, OPT_INT, 500)
 OPTION(mon_max_pgmap_epochs, OPT_INT, 500)
 OPTION(mon_max_log_epochs, OPT_INT, 500)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c3f43bec505a7d130f3f5c582790fc0bbb06cddc..a1232243641787cc36efbe62561b3b5803f4a6eb 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -3044,8 +3044,7 @@ void OSDMonitor::get_health(list<pair<health_status_t,string> >& summary,
     }
 
     // Not using 'sortbitwise' and should be?
-    if (g_conf->mon_warn_on_no_sortbitwise &&
-       !osdmap.test_flag(CEPH_OSDMAP_SORTBITWISE) &&
+    if (!osdmap.test_flag(CEPH_OSDMAP_SORTBITWISE) &&
        (osdmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL) &
         CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT)) {
       ostringstream ss;