PG: collapse crashed transitions to happen on any unexpected event

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 73e4c807b55313a369a743a1fb8c29554ca0a343..fc248e9de9c22ad3c9856c403c8d30c5ca0e0661 100644 (file)
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -909,13 +909,7 @@ public:
       boost::statechart::state< Initial, RecoveryMachine >, NamedState {
       typedef boost::mpl::list <
        boost::statechart::transition< Initialize, Started >,
-       boost::statechart::transition< MNotifyRec, Crashed >,
-       boost::statechart::transition< MInfoRec, Crashed >,
-       boost::statechart::transition< MLogRec, Crashed >,
-       boost::statechart::transition< MQuery, Crashed >,
-       boost::statechart::transition< Activate, Crashed >,
-       boost::statechart::transition< AdvMap, Crashed >,
-       boost::statechart::transition< ActMap, Crashed >
+       boost::statechart::transition< boost::statechart::event_base, Crashed >
        > reactions;
       Initial(my_context ctx);
     };
@@ -925,12 +919,7 @@ public:
       typedef boost::mpl::list <
        boost::statechart::custom_reaction< AdvMap >,
        boost::statechart::custom_reaction< ActMap >,
-       boost::statechart::transition< MNotifyRec, Crashed >,
-       boost::statechart::transition< MInfoRec, Crashed >,
-       boost::statechart::transition< MLogRec, Crashed >,
-       boost::statechart::transition< MQuery, Crashed >,
-       boost::statechart::transition< Initialize, Crashed >,
-       boost::statechart::transition< Activate, Crashed >
+       boost::statechart::transition< boost::statechart::event_base, Crashed >
        > reactions;
       boost::statechart::result react(const AdvMap&);
       boost::statechart::result react(const ActMap&);
@@ -942,13 +931,7 @@ public:
       boost::statechart::state< Started, RecoveryMachine, Start >, NamedState {
       typedef boost::mpl::list <
        boost::statechart::custom_reaction< AdvMap >,
-       boost::statechart::transition< ActMap, Crashed >,
-       boost::statechart::transition< MNotifyRec, Crashed >,
-       boost::statechart::transition< MInfoRec, Crashed >,
-       boost::statechart::transition< MLogRec, Crashed >,
-       boost::statechart::transition< MQuery, Crashed >,
-       boost::statechart::transition< Initialize, Crashed >,
-       boost::statechart::transition< Activate, Crashed >
+       boost::statechart::transition< boost::statechart::event_base, Crashed >
        > reactions;
       boost::statechart::result react(const AdvMap&);
       Started(my_context ctx);
@@ -1021,7 +1004,6 @@ public:
 
     struct ReplicaActive : boost::statechart::state< ReplicaActive, Started >, NamedState {
       typedef boost::mpl::list <
-       boost::statechart::transition< MQuery, Crashed >,
        boost::statechart::custom_reaction< ActMap >,
        boost::statechart::custom_reaction< MInfoRec >
        > reactions;
@@ -1059,9 +1041,7 @@ public:
       set<int> peer_info_requested;
       typedef boost::mpl::list <
        boost::statechart::transition< GotInfo, GetLog >,
-       boost::statechart::custom_reaction< MNotifyRec >,
-       boost::statechart::transition< MLogRec, Crashed >,
-       boost::statechart::transition< BacklogComplete, Crashed >
+       boost::statechart::custom_reaction< MNotifyRec >
        > reactions;
 
       GetInfo(my_context ctx);