osd: merge history when primary sends replica new pg info

This, among other things, lets us update last_epoch_started and
last_epoch_clean.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 812f6baa21add6f2db163e35481de6320c5ec5d6..27e85f82227b361b0bfa27c324ba1157ddb6911f 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -3644,6 +3644,10 @@ void PG::proc_primary_info(ObjectStore::Transaction &t, const Info &oinfo)
   assert(is_active());
   info.stats = oinfo.stats;
 
+  osd->unreg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
+  info.history.merge(oinfo.history);
+  osd->reg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
+
   // Handle changes to purged_snaps
   interval_set<snapid_t> p;
   p.union_of(oinfo.purged_snaps, info.purged_snaps);