]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/PG: ignore RecoveryDone in ReplicaActive too
authorSage Weil <sage@redhat.com>
Thu, 1 Feb 2018 18:59:29 +0000 (12:59 -0600)
committerSage Weil <sage@redhat.com>
Wed, 4 Apr 2018 13:26:51 +0000 (08:26 -0500)
This can be missed on a RepRecovering -> RepNotRecovering ->
RepWaitBackfillReserved transition.  Catch any straggler events in
ReplicaActive.

Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.h

index c66c6b2668ef9b6afae6ce5df8bebe4ec2ca4174..ea577e07f71568ea89a8ece603710a9ed5034918 100644 (file)
@@ -2360,6 +2360,7 @@ protected:
        boost::statechart::custom_reaction< UnfoundBackfill >,
        boost::statechart::custom_reaction< RemoteBackfillPreempted >,
        boost::statechart::custom_reaction< RemoteRecoveryPreempted >,
+       boost::statechart::custom_reaction< RecoveryDone >,
        boost::statechart::transition<DeleteStart, ToDelete>
        > reactions;
       boost::statechart::result react(const QueryState& q);
@@ -2369,6 +2370,9 @@ protected:
       boost::statechart::result react(const ActMap&);
       boost::statechart::result react(const MQuery&);
       boost::statechart::result react(const Activate&);
+      boost::statechart::result react(const RecoveryDone&) {
+       return discard_event();
+      }
       boost::statechart::result react(const DeferRecovery& evt) {
        return discard_event();
       }