From: Sage Weil <sage.weil@dreamhost.com>
Date: Fri, 20 May 2011 22:04:09 +0000 (-0700)
Subject: osd: merge history when primary sends replica new pg info
X-Git-Tag: v0.28.1~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e3191b7dc67d1bece44be7e336042a6af7bf5a69;p=ceph.git

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 812f6baa21a..27e85f82227 100644
--- 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);