diff options
| author | Samuel Just <sam.just@inktank.com> | 2014-03-11 22:23:10 +0100 |
|---|---|---|
| committer | Samuel Just <sam.just@inktank.com> | 2014-03-12 18:38:21 +0100 |
| commit | a4a91ccdc503abe1a5e91723e03126c189e5a4b5 (patch) | |
| tree | f501c4f63c25f2a66630ee457137fd6b84e9b024 /src/osd/PG.h | |
| parent | PG: do not serve requests until replicas have activated (diff) | |
| download | ceph-a4a91ccdc503abe1a5e91723e03126c189e5a4b5.tar.xz ceph-a4a91ccdc503abe1a5e91723e03126c189e5a4b5.zip | |
PG: do not wait for flushed before activation
This should reduce the sting of the previous commit somewhat. We wait
for the activation transactions to clear prior to accepting IO anyway,
so we can go ahead and get that process started without waiting for the
flush.
Signed-off-by: Samuel Just <sam.just@inktank.com>
Diffstat (limited to '')
| -rw-r--r-- | src/osd/PG.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/src/osd/PG.h b/src/osd/PG.h index 5eb2d23f72f..4c1b2cf295e 100644 --- a/src/osd/PG.h +++ b/src/osd/PG.h @@ -1795,7 +1795,6 @@ public: }; struct WaitUpThru; - struct WaitFlushedPeering; struct GetMissing : boost::statechart::state< GetMissing, Peering >, NamedState { set<pg_shard_t> peer_missing_requested; @@ -1806,25 +1805,12 @@ public: typedef boost::mpl::list < boost::statechart::custom_reaction< QueryState >, boost::statechart::custom_reaction< MLogRec >, - boost::statechart::transition< NeedUpThru, WaitUpThru >, - boost::statechart::transition< CheckRepops, WaitFlushedPeering> + boost::statechart::transition< NeedUpThru, WaitUpThru > > reactions; boost::statechart::result react(const QueryState& q); boost::statechart::result react(const MLogRec& logevt); }; - struct WaitFlushedPeering : - boost::statechart::state< WaitFlushedPeering, Peering>, NamedState { - WaitFlushedPeering(my_context ctx); - void exit() {} - typedef boost::mpl::list < - boost::statechart::custom_reaction< QueryState >, - boost::statechart::custom_reaction< FlushedEvt > - > reactions; - boost::statechart::result react(const FlushedEvt& evt); - boost::statechart::result react(const QueryState& q); - }; - struct WaitUpThru : boost::statechart::state< WaitUpThru, Peering >, NamedState { WaitUpThru(my_context ctx); void exit(); @@ -1832,7 +1818,6 @@ public: typedef boost::mpl::list < boost::statechart::custom_reaction< QueryState >, boost::statechart::custom_reaction< ActMap >, - boost::statechart::transition< CheckRepops, WaitFlushedPeering>, boost::statechart::custom_reaction< MLogRec > > reactions; boost::statechart::result react(const QueryState& q); |