From: Sage Weil <sage@redhat.com>
Date: Sat, 28 Oct 2017 13:12:02 +0000 (-0500)
Subject: osd/PG: fix Remote*Preempted handling in ReplicaActive
X-Git-Tag: v13.0.1~375^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea0bfe66887edbc528804a42777320100df3c9e3;p=ceph.git

osd/PG: fix Remote*Preempted handling in ReplicaActive

This was only half-implemented by c1e652a4547d89b889954ca4bdb82506ca0f1d83

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

diff --git a/src/osd/PG.h b/src/osd/PG.h
index 8d6a25e4ecb3..74aa788056e4 100644
--- a/src/osd/PG.h
+++ b/src/osd/PG.h
@@ -2267,7 +2267,9 @@ protected:
 	boost::statechart::custom_reaction< DeferRecovery >,
 	boost::statechart::custom_reaction< DeferBackfill >,
 	boost::statechart::custom_reaction< UnfoundRecovery >,
-	boost::statechart::custom_reaction< UnfoundBackfill >
+	boost::statechart::custom_reaction< UnfoundBackfill >,
+	boost::statechart::custom_reaction< RemoteBackfillPreempted >,
+	boost::statechart::custom_reaction< RemoteRecoveryPreempted >
 	> reactions;
       boost::statechart::result react(const QueryState& q);
       boost::statechart::result react(const MInfoRec& infoevt);