osd: check against last_peering_reset in _activate_committed

We are checking against last_peering_reset in _activate_committed(), so we
need to pass in that value to compare against; last_peering_reset may be
greater than same_interval_since, e.g. on a replica that learns about the
PG after the initial creation epoch.

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index b146c5cfe3732753cd7c5a3a829cdbe567a06a21..5d23cdff70b6ace810943dfa8e08657b368ec072 100644 (file)
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1241,7 +1241,7 @@ void PG::activate(ObjectStore::Transaction& t, list<Context*>& tfin,
 
   // find out when we commit
   get();   // for callback
-  tfin.push_back(new C_PG_ActivateCommitted(this, info.history.same_interval_since,
+  tfin.push_back(new C_PG_ActivateCommitted(this, last_peering_reset,
                                            get_osdmap()->get_cluster_inst(acting[0])));
   
   // initialize snap_trimq