osd: advance last_backfill by keys only

This ensures that transactions are never split by last_backfill.

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

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index cb946b2031ff1ed87478b1193011d19bf3ff442d..09172247aa818fb55bf508e86931ff9b96c27a48 100644 (file)
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -5394,8 +5394,10 @@ int ReplicatedPG::recover_backfill(int max)
     }
   }
 
-  if (pinfo.last_backfill < pbi.begin) {
-    pinfo.last_backfill = pbi.begin;
+  hobject_t bound = pbi.begin;
+  bound.back_up_to_bounding_key;
+  if (pinfo.last_backfill < bound) {
+    pinfo.last_backfill = bound;
 
     dout(10) << " peer osd." << backfill_target << " info.last_backfill now " << pinfo.last_backfill << dendl;