From e468fc0d3b8c5f4d7713e4015d4d7ccbfa5bccf9 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 3 Feb 2021 16:46:22 -0500 Subject: [PATCH] osdc/Objecter: remove pool_full_try interface Signed-off-by: Sage Weil --- src/osdc/Objecter.cc | 4 ---- src/osdc/Objecter.h | 4 ---- 2 files changed, 8 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index b949c0ca540..d935b73adb9 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2353,10 +2353,6 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_t ceph_assert(op->target.flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)); - if (pool_full_try) { - op->target.flags |= CEPH_OSD_FLAG_FULL_TRY; - } - bool need_send = false; if (op->target.paused) { ldout(cct, 10) << " tid " << op->tid << " op " << op << " is paused" diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 96c036f7a08..5af605913c0 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -1653,7 +1653,6 @@ private: std::atomic global_op_flags{0}; // flags which are applied to each IO op bool keep_balanced_budget = false; bool honor_pool_full = true; - bool pool_full_try = false; // If this is true, accumulate a set of blocklisted entities // to be drained by consume_blocklist_events. @@ -2615,9 +2614,6 @@ private: void set_honor_pool_full() { honor_pool_full = true; } void unset_honor_pool_full() { honor_pool_full = false; } - void set_pool_full_try() { pool_full_try = true; } - void unset_pool_full_try() { pool_full_try = false; } - void _scan_requests( OSDSession *s, bool skipped_map, -- 2.39.5