]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: condition remote backfill preemption on RECOVERY_RESERVATION_2
authorSage Weil <sage@redhat.com>
Thu, 26 Oct 2017 02:58:46 +0000 (21:58 -0500)
committerSage Weil <sage@redhat.com>
Fri, 27 Oct 2017 13:07:08 +0000 (08:07 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
src/osd/PG.cc

index 21377cbe89d0bc3617841703334bcc703d416bd2..33a8a780d847b5d303ecdf431f359708115d96bc 100644 (file)
@@ -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(),