From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Feb 2017 02:41:28 +0000 (-0600)
Subject: osd: set min_epoch for MOSDPGBackfill
X-Git-Tag: v12.0.3~80^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8c961a311fe9fde7f037d97fdbc5c012e770ead8;p=ceph.git

osd: set min_epoch for MOSDPGBackfill

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

diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h
index b6557ee807e8..7f637b9ef83d 100644
--- a/src/messages/MOSDPGBackfill.h
+++ b/src/messages/MOSDPGBackfill.h
@@ -44,6 +44,9 @@ public:
   epoch_t get_map_epoch() const override {
     return map_epoch;
   }
+  epoch_t get_min_epoch() const override {
+    return query_epoch;
+  }
   spg_t get_spg() const override {
     return pgid;
   }
diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 8bf2dca2bf8e..085ec3eb99a7 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -11433,7 +11433,7 @@ uint64_t PrimaryLogPG::recover_backfill(
         m = new MOSDPGBackfill(
 	  MOSDPGBackfill::OP_BACKFILL_FINISH,
 	  e,
-	  e,
+	  last_peering_reset,
 	  spg_t(info.pgid.pgid, bt.shard));
         // Use default priority here, must match sub_op priority
         /* pinfo.stats might be wrong if we did log-based recovery on the
@@ -11445,7 +11445,7 @@ uint64_t PrimaryLogPG::recover_backfill(
         m = new MOSDPGBackfill(
 	  MOSDPGBackfill::OP_BACKFILL_PROGRESS,
 	  e,
-	  e,
+	  last_peering_reset,
 	  spg_t(info.pgid.pgid, bt.shard));
         // Use default priority here, must match sub_op priority
       }