From: Sage Weil <sage@redhat.com>
Date: Wed, 8 Feb 2017 22:00:57 +0000 (-0500)
Subject: osd/PG: always bitwise
X-Git-Tag: v12.0.1~427^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b02439ff1cbea794bfbd6c76bc5ecf9126bd5c31;p=ceph.git

osd/PG: always bitwise

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index fda242b9237e..1275caaea533 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1655,7 +1655,7 @@ void PG::activate(ObjectStore::Transaction& t,
        */
       bool force_restart_backfill =
 	!pi.last_backfill.is_max() &&
-	pi.last_backfill_bitwise != get_sort_bitwise();
+	!pi.last_backfill_bitwise;
 
       if (pi.last_update == info.last_update && !force_restart_backfill) {
         // empty log
@@ -5437,9 +5437,6 @@ ostream& operator<<(ostream& out, const PG& pg)
   if (pg.scrubber.must_scrub)
     out << " MUST_SCRUB";
 
-  if (!pg.get_sort_bitwise())
-    out << " NIBBLEWISE";
-
   //out << " (" << pg.pg_log.get_tail() << "," << pg.pg_log.get_head() << "]";
   if (pg.pg_log.get_missing().num_missing()) {
     out << " m=" << pg.pg_log.get_missing().num_missing();
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index e160709cfb2f..be16d53da926 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -1108,8 +1108,7 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op)
 	hobject_t pg_end = info.pgid.pgid.get_hobj_end(pool.info.get_pg_num());
         dout(10) << " pgnls lower_bound " << lower_bound
 		 << " pg_end " << pg_end << dendl;
-	if (get_sort_bitwise() &&
-	    ((!lower_bound.is_max() && lower_bound >= pg_end) ||
+	if (((!lower_bound.is_max() && lower_bound >= pg_end) ||
 	     (lower_bound != hobject_t() && lower_bound < pg_start))) {
 	  // this should only happen with a buggy client.
 	  dout(10) << "outside of PG bounds " << pg_start << " .. "
@@ -10871,7 +10870,6 @@ uint64_t PrimaryLogPG::recover_backfill(
   dout(10) << "recover_backfill (" << max << ")"
            << " bft=" << backfill_targets
 	   << " last_backfill_started " << last_backfill_started
-	   << " sort " << (get_sort_bitwise() ? "bitwise" : "nibblewise")
 	   << (new_backfill ? " new_backfill":"")
 	   << dendl;
   assert(!backfill_targets.empty());