From: chenqiuzhang <chen.qiuzhang@h3c.com>
Date: Wed, 14 Aug 2019 17:21:13 +0000 (-0400)
Subject: move primary reaction <NeedActingChange, WaitActingChange> to GetLog reaction would... 
X-Git-Tag: v15.1.0~239^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e5d27999b09247c541b1c93b138d5cf9b31b355;p=ceph.git

move primary reaction <NeedActingChange, WaitActingChange> to GetLog reaction would solve
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>
---

diff --git a/src/osd/PeeringState.h b/src/osd/PeeringState.h
index e84638f68c4..a24fe6dab32 100644
--- a/src/osd/PeeringState.h
+++ b/src/osd/PeeringState.h
@@ -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&);