]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: set_last_peering_reset in Reset constructor
authorSamuel Just <samuel.just@dreamhost.com>
Tue, 1 Nov 2011 18:16:53 +0000 (11:16 -0700)
committerSamuel Just <samuel.just@dreamhost.com>
Tue, 1 Nov 2011 18:16:56 +0000 (11:16 -0700)
If an osd in the prior set comes up, we can restart peering without a
new peering interval starting.  However, we still want to ignore
anything we previously requested from replicas.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
src/osd/PG.cc

index 7621f7ca063c20e2b2efca62f95739239cc5b4a1..d6ede4cc602825f52239e1881dae9e983643a189 100644 (file)
@@ -3911,6 +3911,8 @@ void PG::RecoveryState::Started::exit() {
 PG::RecoveryState::Reset::Reset(my_context ctx) : my_base(ctx) {
   state_name = "Reset";
   context< RecoveryMachine >().log_enter(state_name);
+  PG *pg = context< RecoveryMachine >().pg;
+  pg->set_last_peering_reset();
 }
 
 boost::statechart::result