From: Samuel Just <sam.just@inktank.com>
Date: Tue, 29 Oct 2013 06:05:30 +0000 (-0700)
Subject: ReplicatedPG::recover_backfill: update last_backfill to max() when backfill is complete
X-Git-Tag: v0.72-rc1~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7a06a71e0f2023f66d003dfb0168f4fe51eaa058;p=ceph.git

ReplicatedPG::recover_backfill: update last_backfill to max() when backfill is complete

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 738b43494d26..ba6b7ecca717 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -8153,6 +8153,12 @@ int ReplicatedPG::recover_backfill(
   }
   assert(!pending_backfill_updates.empty() ||
 	 new_last_backfill == last_backfill_started);
+  if (pending_backfill_updates.empty() &&
+      backfill_pos.is_max()) {
+    assert(backfills_in_flight.empty());
+    new_last_backfill = backfill_pos;
+    last_backfill_started = backfill_pos;
+  }
   if (new_last_backfill > pinfo.last_backfill) {
     pinfo.last_backfill = new_last_backfill;
     epoch_t e = get_osdmap()->get_epoch();