From c0482d7afaaaac1deba9e00330d08a4d3ada65b3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 31 Jan 2020 11:59:26 -0600 Subject: [PATCH] osdc/Objecter: remove duplicated pause check code _calc_target() already pauses and unpauses based on the target_should_be_paused() helper, and we just called _calc_target at the top of this method. Signed-off-by: Sage Weil --- src/osdc/Objecter.cc | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 05e9febcc20..7c791eaf655 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2421,30 +2421,9 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid) } bool need_send = false; - - if (osdmap->get_epoch() < epoch_barrier) { - ldout(cct, 10) << " barrier, paused " << op << " tid " << op->tid - << dendl; - op->target.paused = true; - _maybe_request_map(); - } else if ((op->target.flags & CEPH_OSD_FLAG_WRITE) && - osdmap->test_flag(CEPH_OSDMAP_PAUSEWR)) { - ldout(cct, 10) << " paused modify " << op << " tid " << op->tid + if (op->target.paused) { + ldout(cct, 10) << " tid " << op->tid << " op " << op << " is paused" << dendl; - op->target.paused = true; - _maybe_request_map(); - } else if ((op->target.flags & CEPH_OSD_FLAG_READ) && - osdmap->test_flag(CEPH_OSDMAP_PAUSERD)) { - ldout(cct, 10) << " paused read " << op << " tid " << op->tid - << dendl; - op->target.paused = true; - _maybe_request_map(); - } else if (op->target.respects_full() && - (_osdmap_full_flag() || - _osdmap_pool_full(op->target.base_oloc.pool))) { - ldout(cct, 0) << " FULL, paused modify " << op << " tid " - << op->tid << dendl; - op->target.paused = true; _maybe_request_map(); } else if (!s->is_homeless()) { need_send = true; -- 2.39.5