From 5ee4b5cca142a4f47a175f1584ccebc0fb508b33 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 27 Sep 2019 15:35:37 +0800 Subject: [PATCH] osdc/Objecter: s/honor_osdmap_full/honor_pool_full/ and s/osdmap_full_try/pool_full_try/ Signed-off-by: Kefu Chai --- src/librados/librados_c.cc | 4 ++-- src/librados/librados_cxx.cc | 4 ++-- src/mds/MDSRank.cc | 2 +- src/osdc/Objecter.cc | 8 ++++---- src/osdc/Objecter.h | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/librados/librados_c.cc b/src/librados/librados_c.cc index 9ace39da43f..0fc1c65bb72 100644 --- a/src/librados/librados_c.cc +++ b/src/librados/librados_c.cc @@ -445,14 +445,14 @@ LIBRADOS_C_API_BASE_DEFAULT(rados_blacklist_add); extern "C" void _rados_set_osdmap_full_try(rados_ioctx_t io) { librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; - ctx->objecter->set_osdmap_full_try(); + ctx->objecter->set_pool_full_try(); } LIBRADOS_C_API_BASE_DEFAULT(rados_set_osdmap_full_try); extern "C" void _rados_unset_osdmap_full_try(rados_ioctx_t io) { librados::IoCtxImpl *ctx = (librados::IoCtxImpl *)io; - ctx->objecter->unset_osdmap_full_try(); + ctx->objecter->unset_pool_full_try(); } LIBRADOS_C_API_BASE_DEFAULT(rados_unset_osdmap_full_try); diff --git a/src/librados/librados_cxx.cc b/src/librados/librados_cxx.cc index c938ce00c21..9637da1e929 100644 --- a/src/librados/librados_cxx.cc +++ b/src/librados/librados_cxx.cc @@ -2240,12 +2240,12 @@ librados::IoCtx::IoCtx(IoCtxImpl *io_ctx_impl_) void librados::IoCtx::set_osdmap_full_try() { - io_ctx_impl->objecter->set_osdmap_full_try(); + io_ctx_impl->objecter->set_pool_full_try(); } void librados::IoCtx::unset_osdmap_full_try() { - io_ctx_impl->objecter->unset_osdmap_full_try(); + io_ctx_impl->objecter->unset_pool_full_try(); } ///////////////////////////// Rados ////////////////////////////// diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index c61ab5e408f..2d3adc9e69b 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -522,7 +522,7 @@ MDSRank::MDSRank( purge_queue.update_op_limit(*mdsmap); - objecter->unset_honor_osdmap_full(); + objecter->unset_honor_pool_full(); finisher = new Finisher(cct, "MDSRank", "MR_Finisher"); diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index c5389d12b0f..a0f3ccef234 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2415,7 +2415,7 @@ void Objecter::_op_submit(Op *op, shunique_lock& sul, ceph_tid_t *ptid) ceph_assert(op->target.flags & (CEPH_OSD_FLAG_READ|CEPH_OSD_FLAG_WRITE)); - if (osdmap_full_try) { + if (pool_full_try) { op->target.flags |= CEPH_OSD_FLAG_FULL_TRY; } @@ -2707,7 +2707,7 @@ bool Objecter::_osdmap_has_pool_full() const bool Objecter::_osdmap_pool_full(const pg_pool_t &p) const { - return p.has_flag(pg_pool_t::FLAG_FULL) && honor_osdmap_full; + return p.has_flag(pg_pool_t::FLAG_FULL) && honor_pool_full; } /** @@ -2716,7 +2716,7 @@ bool Objecter::_osdmap_pool_full(const pg_pool_t &p) const bool Objecter::_osdmap_full_flag() const { // Ignore the FULL flag if the caller does not have honor_osdmap_full - return osdmap->test_flag(CEPH_OSDMAP_FULL) && honor_osdmap_full; + return osdmap->test_flag(CEPH_OSDMAP_FULL) && honor_pool_full; } void Objecter::update_pool_full_map(map& pool_full_map) @@ -3191,7 +3191,7 @@ MOSDOp *Objecter::_prepare_osd_op(Op *op) // pre-luminous osds flags |= CEPH_OSD_FLAG_ONDISK; - if (!honor_osdmap_full) + if (!honor_pool_full) flags |= CEPH_OSD_FLAG_FULL_FORCE; op->target.paused = false; diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index 165de030379..f669ce31c5f 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -1253,8 +1253,8 @@ private: std::atomic num_in_flight{0}; std::atomic global_op_flags{0}; // flags which are applied to each IO op bool keep_balanced_budget = false; - bool honor_osdmap_full = true; - bool osdmap_full_try = false; + bool honor_pool_full = true; + bool pool_full_try = false; // If this is true, accumulate a set of blacklisted entities // to be drained by consume_blacklist_events. @@ -2139,11 +2139,11 @@ private: void set_balanced_budget() { keep_balanced_budget = true; } void unset_balanced_budget() { keep_balanced_budget = false; } - void set_honor_osdmap_full() { honor_osdmap_full = true; } - void unset_honor_osdmap_full() { honor_osdmap_full = false; } + void set_honor_pool_full() { honor_pool_full = true; } + void unset_honor_pool_full() { honor_pool_full = false; } - void set_osdmap_full_try() { osdmap_full_try = true; } - void unset_osdmap_full_try() { osdmap_full_try = false; } + void set_pool_full_try() { pool_full_try = true; } + void unset_pool_full_try() { pool_full_try = false; } void _scan_requests( OSDSession *s, -- 2.39.5