From: Sage Weil <sage@redhat.com>
Date: Thu, 1 Feb 2018 18:59:29 +0000 (-0600)
Subject: osd/PG: ignore RecoveryDone in ReplicaActive too
X-Git-Tag: v13.1.0~390^2~90
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=c5b39139197e4737a4cd250184a620a92f645437;p=ceph-ci.git

osd/PG: ignore RecoveryDone in ReplicaActive too

This can be missed on a RepRecovering -> RepNotRecovering ->
RepWaitBackfillReserved transition.  Catch any straggler events in
ReplicaActive.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/PG.h b/src/osd/PG.h
index c66c6b2668e..ea577e07f71 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -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();
       }