From: Samuel Just <sam.just@inktank.com>
Date: Thu, 14 Jun 2012 20:04:27 +0000 (-0700)
Subject: Revert "osd: check against last_peering_reset in _activate_committed"
X-Git-Tag: v0.50~109^2~2^2~21
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f9282e6c6dc69f0d8d19c558efccd35dfbd0e092;p=ceph.git

Revert "osd: check against last_peering_reset in _activate_committed"

This reverts commit 86aa07d7a91ac23074e76551c3a6db3a5736cffa.
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index acbf15c2200d..bdcd67fee34f 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1305,7 +1305,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, last_peering_reset,
+  tfin.push_back(new C_PG_ActivateCommitted(this, info.history.same_interval_since,
 					    get_osdmap()->get_cluster_inst(acting[0])));
   
   // initialize snap_trimq