From: Samuel Just <sjust@redhat.com>
Date: Sat, 12 Oct 2019 00:30:17 +0000 (-0700)
Subject: PrimaryLogPG::maybe_kick_recovery: simply use CEPH_MSG_PRIO_HIGH
X-Git-Tag: v15.1.0~1180^2~5
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=488625e2919049b700b9e1effbec2e52c47a0d2f;p=ceph-ci.git

PrimaryLogPG::maybe_kick_recovery: simply use CEPH_MSG_PRIO_HIGH

Not all schedulers necessarily depend on a particular strict/non-strict
cutoff.  Instead, simply shedule at CEPH_MSG_PRIO_HIGH.

See also: d346fdca06d0dc66eafcdaf281de352170bcf08c

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 1667781b890..ec013eb085a 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -560,13 +560,13 @@ void PrimaryLogPG::maybe_kick_recovery(
     dout(7) << "object " << soid << " v " << v << ", recovering." << dendl;
     PGBackend::RecoveryHandle *h = pgbackend->open_recovery_op();
     if (is_missing_object(soid)) {
-      recover_missing(soid, v, osd->osd->op_prio_cutoff, h);
+      recover_missing(soid, v, CEPH_MSG_PRIO_HIGH, h);
     } else if (recovery_state.get_missing_loc().is_deleted(soid)) {
       prep_object_replica_deletes(soid, v, h, &work_started);
     } else {
       prep_object_replica_pushes(soid, v, h, &work_started);
     }
-    pgbackend->run_recovery_op(h, osd->osd->op_prio_cutoff);
+    pgbackend->run_recovery_op(h, CEPH_MSG_PRIO_HIGH);
   }
 }