osd/PG: drop osd_debug_randomize_hobj_sort_order

This is required post-jewel; no need to thrash it.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 7db3dc642cd95539d09d42682fb7b9c7296233ea..7cf82fe76cdaa8c1cfc2312bdb0d496cec108208 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -852,7 +852,6 @@ OPTION(osd_debug_verify_stray_on_activate, OPT_BOOL, false)
 OPTION(osd_debug_skip_full_check_in_backfill_reservation, OPT_BOOL, false)
 OPTION(osd_debug_reject_backfill_probability, OPT_DOUBLE, 0)
 OPTION(osd_debug_inject_copyfrom_error, OPT_BOOL, false)  // inject failure during copyfrom completion
-OPTION(osd_debug_randomize_hobject_sort_order, OPT_BOOL, false)
 OPTION(osd_debug_misdirected_ops, OPT_BOOL, false)
 OPTION(osd_enxio_on_misdirected_op, OPT_BOOL, false)
 OPTION(osd_debug_verify_cached_snaps, OPT_BOOL, false)

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 3efe4df4115c8f533a6ba48944264d65fe5f66fe..378e07e79c4470aea9ae9a6ee6cc4f619d3cdc34 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5117,13 +5117,6 @@ void PG::on_new_interval()
   do_sort_bitwise = osdmap->test_flag(CEPH_OSDMAP_SORTBITWISE);
   if (do_sort_bitwise) {
     assert(get_min_upacting_features() & CEPH_FEATURE_OSD_BITWISE_HOBJ_SORT);
-    if (cct->_conf->osd_debug_randomize_hobject_sort_order) {
-      // randomly use a nibblewise sort (when we otherwise might have
-      // done bitwise) based on some *deterministic* function such that
-      // all peers/osds will agree.
-      do_sort_bitwise =
-       (info.history.same_interval_since + info.pgid.ps()) & 1;
-    }
   }
 
   _on_new_interval();