From: Sage Weil <sage@redhat.com>
Date: Mon, 24 Jun 2019 15:22:22 +0000 (-0500)
Subject: osd: drop last_backfill_bitwise handling
X-Git-Tag: v15.1.0~2236^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc59c401162b2d197eb7b582724a5d1bf8f71a2b;p=ceph.git

osd: drop last_backfill_bitwise handling

Bitwise has been required since luminous.  We don't need this code now.

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

diff --git a/src/osd/MissingLoc.cc b/src/osd/MissingLoc.cc
index 91c1af1d13c..4b3833aaa01 100644
--- a/src/osd/MissingLoc.cc
+++ b/src/osd/MissingLoc.cc
@@ -95,15 +95,6 @@ bool MissingLoc::add_source_info(
 		     << " < needed " << need << ")" << dendl;
       continue;
     }
-    if (!oinfo.last_backfill.is_max() &&
-	!oinfo.last_backfill_bitwise) {
-      ldout(cct, 10) << "search_for_missing " << soid << " " << need
-		     << " also missing on osd." << fromosd
-		     << " (last_backfill " << oinfo.last_backfill
-		     << " but with wrong sort order)"
-		     << dendl;
-      continue;
-    }
     if (p->first >= oinfo.last_backfill) {
       // FIXME: this is _probably_ true, although it could conceivably
       // be in the undefined region!  Hmm!
diff --git a/src/osd/PGLog.cc b/src/osd/PGLog.cc
index 8438873a37b..63f8924176e 100644
--- a/src/osd/PGLog.cc
+++ b/src/osd/PGLog.cc
@@ -460,7 +460,6 @@ void PGLog::merge_log(pg_info_t &oinfo, pg_log_t &olog, pg_shard_t fromosd,
     new_entries.splice(new_entries.end(), olog.log, from, to);
     append_log_entries_update_missing(
       info.last_backfill,
-      info.last_backfill_bitwise,
       new_entries,
       false,
       &log,
diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h
index 47ea9248cbd..8a996860e39 100644
--- a/src/osd/PGLog.h
+++ b/src/osd/PGLog.h
@@ -1188,7 +1188,6 @@ public:
   template <typename missing_type>
   static bool append_log_entries_update_missing(
     const hobject_t &last_backfill,
-    bool last_backfill_bitwise,
     const mempool::osd_pglog::list<pg_log_entry_t> &entries,
     bool maintain_rollback,
     IndexedLog *log,
@@ -1232,12 +1231,10 @@ public:
   }
   bool append_new_log_entries(
     const hobject_t &last_backfill,
-    bool last_backfill_bitwise,
     const mempool::osd_pglog::list<pg_log_entry_t> &entries,
     LogEntryHandler *rollbacker) {
     bool invalidate_stats = append_log_entries_update_missing(
       last_backfill,
-      last_backfill_bitwise,
       entries,
       true,
       &log,
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
index a707e48426f..083ce4fef3a 100644
--- a/src/osd/PeeringState.cc
+++ b/src/osd/PeeringState.cc
@@ -2198,15 +2198,7 @@ void PeeringState::activate(
 
       bool needs_past_intervals = pi.dne();
 
-      /*
-       * cover case where peer sort order was different and
-       * last_backfill cannot be interpreted
-       */
-      bool force_restart_backfill =
-	!pi.last_backfill.is_max() &&
-	!pi.last_backfill_bitwise;
-
-      if (pi.last_update == info.last_update && !force_restart_backfill) {
+      if (pi.last_update == info.last_update) {
         // empty log
 	if (!pi.last_backfill.is_max())
 	  pl->get_clog_info() << info.pgid << " continuing backfill to osd."
@@ -2235,7 +2227,6 @@ void PeeringState::activate(
       } else if (
 	pg_log.get_tail() > pi.last_update ||
 	pi.last_backfill == hobject_t() ||
-	force_restart_backfill ||
 	(backfill_targets.count(*i) && pi.last_backfill.is_max())) {
 	/* ^ This last case covers a situation where a replica is not contiguous
 	 * with the auth_log, but is contiguous with this replica.  Reshuffling
@@ -3450,7 +3441,6 @@ bool PeeringState::append_log_entries_update_missing(
   bool invalidate_stats =
     pg_log.append_new_log_entries(
       info.last_backfill,
-      info.last_backfill_bitwise,
       entries,
       rollbacker.get());
 
@@ -3502,7 +3492,6 @@ void PeeringState::merge_new_log_entries(
     pg_info_t& pinfo(peer_info[peer]);
     bool invalidate_stats = PGLog::append_log_entries_update_missing(
       pinfo.last_backfill,
-      info.last_backfill_bitwise,
       entries,
       true,
       NULL,