From: David Zafman <david.zafman@inktank.com>
Date: Sat, 2 Nov 2013 01:15:49 +0000 (-0700)
Subject: ReplicatedPG,PG: move duplicate FlushedEvt logic info on_flushed()
X-Git-Tag: v0.74~72^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=da7755324db276bf454132b638e9ee2d22651317;p=ceph.git

ReplicatedPG,PG: move duplicate FlushedEvt logic info on_flushed()

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 8207a675bce4a..81b9e2e6a755c 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -5106,9 +5106,7 @@ boost::statechart::result
 PG::RecoveryState::Started::react(const FlushedEvt&)
 {
   PG *pg = context< RecoveryMachine >().pg;
-  pg->flushed = true;
   pg->on_flushed();
-  pg->requeue_ops(pg->waiting_for_active);
   return discard_event();
 }
 
@@ -5159,9 +5157,7 @@ boost::statechart::result
 PG::RecoveryState::Reset::react(const FlushedEvt&)
 {
   PG *pg = context< RecoveryMachine >().pg;
-  pg->flushed = true;
   pg->on_flushed();
-  pg->requeue_ops(pg->waiting_for_active);
   return discard_event();
 }
 
@@ -6838,8 +6834,6 @@ boost::statechart::result
 PG::RecoveryState::WaitFlushedPeering::react(const FlushedEvt &evt)
 {
   PG *pg = context< RecoveryMachine >().pg;
-  pg->flushed = true;
-  pg->requeue_ops(pg->waiting_for_active);
   pg->on_flushed();
   return transit< WaitFlushedPeering >();
 }
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 57d9ec72bbd42..e957a415f0c73 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -7302,6 +7302,8 @@ void ReplicatedPG::on_flushed()
   }
   assert(object_contexts.empty());
   pgbackend->on_flushed();
+  flushed = true;
+  requeue_ops(pg->waiting_for_active);
 }
 
 void ReplicatedPG::on_removal(ObjectStore::Transaction *t)