From 5ca13ff7c06c7737ec460b72026f23590cbdf82f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 7 Feb 2017 12:15:41 -0500 Subject: [PATCH] osd/PG: drop osd_debug_randomize_hobj_sort_order This is required post-jewel; no need to thrash it. Signed-off-by: Sage Weil --- src/common/config_opts.h | 1 - src/osd/PG.cc | 7 ------- 2 files changed, 8 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 7db3dc642cd..7cf82fe76cd 100644 --- 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 3efe4df4115..378e07e79c4 100644 --- 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(); -- 2.39.5