osd: min_epoch for MOSDPGScan

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

diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h
index e5c25caaa57162f471d8a3f5f57691f890e891cb..3c01b406fd850f6175b13f93b6d432529095b924 100644 (file)
--- a/src/messages/MOSDPGScan.h
+++ b/src/messages/MOSDPGScan.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 085ec3eb99a7146419d5853d361e558091918d95..85f5c97cbb65f2b9d2981eae23f9f9d53e8a4ccd 100644 (file)
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -11129,7 +11129,7 @@ uint64_t PrimaryLogPG::recover_backfill(
        dout(10) << " scanning peer osd." << bt << " from " << pbi.end << dendl;
        epoch_t e = get_osdmap()->get_epoch();
        MOSDPGScan *m = new MOSDPGScan(
-         MOSDPGScan::OP_SCAN_GET_DIGEST, pg_whoami, e, e,
+         MOSDPGScan::OP_SCAN_GET_DIGEST, pg_whoami, e, last_peering_reset,
          spg_t(info.pgid.pgid, bt.shard),
          pbi.end, hobject_t());
        osd->send_message_osd_cluster(bt.osd, m, get_osdmap()->get_epoch());