]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: always use strict priority ordering for kicked recovery ops 30632/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sun, 29 Sep 2019 05:50:37 +0000 (13:50 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Sun, 29 Sep 2019 06:05:56 +0000 (14:05 +0800)
See 590c4979d40ea2073da8180140303ac067d87cc4 for the background of
this change.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PrimaryLogPG.cc

index ce0aaef8a1236177475991aeb07c922ebce214a9..930f78aabc4a8431f03b2c9b2cb11878a96aec2c 100644 (file)
@@ -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);
   }
 }