]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
move primary reaction <NeedActingChange, WaitActingChange> to GetLog reaction would...
authorchenqiuzhang <chen.qiuzhang@h3c.com>
Wed, 14 Aug 2019 17:21:13 +0000 (13:21 -0400)
committerchenqiuzhang <chen.qiuzhang@h3c.com>
Wed, 14 Aug 2019 17:21:34 +0000 (13:21 -0400)
pg stuck in waitactingchange, it will avoid want_acting clear in exit Primary state.

fix: https://tracker.ceph.com/issues/40117

Signed-off-by: chen qiuzhang <chen.qiuzhang@h3c.com>
src/osd/PeeringState.h

index e84638f68c48cfcfa7380e722d53a727f3382a66..a24fe6dab32538a71e8d1ce5d79e029858b4e70a 100644 (file)
@@ -720,7 +720,6 @@ public:
     typedef boost::mpl::list <
       boost::statechart::custom_reaction< ActMap >,
       boost::statechart::custom_reaction< MNotifyRec >,
-      boost::statechart::transition< NeedActingChange, WaitActingChange >,
       boost::statechart::custom_reaction<SetForceRecovery>,
       boost::statechart::custom_reaction<UnsetForceRecovery>,
       boost::statechart::custom_reaction<SetForceBackfill>,
@@ -1222,6 +1221,7 @@ public:
       boost::statechart::custom_reaction< MLogRec >,
       boost::statechart::custom_reaction< GotLog >,
       boost::statechart::custom_reaction< AdvMap >,
+      boost::statechart::transition< NeedActingChange, WaitActingChange >,
       boost::statechart::transition< IsIncomplete, Incomplete >
       > reactions;
     boost::statechart::result react(const AdvMap&);