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 b6557ee807e8afd0d321021e2d9a7e2eb404f495..7f637b9ef83d241e238045785bbcd345d3429419 100644 (file)
--- 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 8bf2dca2bf8eb4c1f93a2fa99395c372d8b546dd..085ec3eb99a7146419d5853d361e558091918d95 100644 (file)
--- 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
       }