From d346fdca06d0dc66eafcdaf281de352170bcf08c Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Sun, 29 Sep 2019 13:50:37 +0800 Subject: [PATCH] osd/PrimaryLogPG: always use strict priority ordering for kicked recovery ops See 590c4979d40ea2073da8180140303ac067d87cc4 for the background of this change. Signed-off-by: xie xingguo --- src/osd/PrimaryLogPG.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index ce0aaef8a1236..930f78aabc4a8 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, cct->_conf->osd_client_op_priority, h); + recover_missing(soid, v, osd->osd->op_prio_cutoff, 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, cct->_conf->osd_client_op_priority); + pgbackend->run_recovery_op(h, osd->osd->op_prio_cutoff); } } -- 2.39.5