From: Sage Weil <sage@redhat.com>
Date: Thu, 26 Oct 2017 02:58:46 +0000 (-0500)
Subject: osd/PG: condition remote backfill preemption on RECOVERY_RESERVATION_2
X-Git-Tag: v13.0.1~375^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4054c5f6e70e0ec64f53bfa9d88c2057cf1edc83;p=ceph.git

osd/PG: condition remote backfill preemption on RECOVERY_RESERVATION_2

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

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 21377cbe89d0..33a8a780d847 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -6756,7 +6756,7 @@ PG::RecoveryState::RepNotRecovering::react(const RequestBackfillPrio &evt)
     post_event(RejectRemoteReservation());
   } else {
     Context *preempt = nullptr;
-    if (HAVE_FEATURE(pg->upacting_features, SERVER_MIMIC)) {
+    if (HAVE_FEATURE(pg->upacting_features, RECOVERY_RESERVATION_2)) {
       // older peers will interpret preemption as TOOFULL
       preempt = new QueuePeeringEvt<RemoteBackfillPreempted>(
 	pg, pg->get_osdmap()->get_epoch(),