From ba410b3a36ecdef1d083731b3ea044bd96af6717 Mon Sep 17 00:00:00 2001 From: Matt Benjamin Date: Wed, 25 May 2022 15:37:36 -0400 Subject: [PATCH] rgwlc: define RGWLC::thr_name() and use it to name lc lock cookies Signed-off-by: Matt Benjamin --- src/rgw/rgw_lc.cc | 5 ++--- src/rgw/rgw_lc.h | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc index ad0936612b4..08f705d5e8b 100644 --- a/src/rgw/rgw_lc.cc +++ b/src/rgw/rgw_lc.cc @@ -1902,8 +1902,7 @@ int RGWLC::process_bucket(int index, int max_lock_secs, LCWorker* worker, int ret = 0; std::unique_ptr serializer = sal_lc->get_serializer(lc_index_lock_name, obj_names[index], - std::string()); - + worker->thr_name()); std::unique_ptr entry; if (max_lock_secs <= 0) { return -EAGAIN; @@ -2054,7 +2053,7 @@ int RGWLC::process(int index, int max_lock_secs, LCWorker* worker, << dendl; std::unique_ptr lock = - sal_lc->get_serializer(lc_index_lock_name, lc_shard, std::string()); + sal_lc->get_serializer(lc_index_lock_name, lc_shard, worker->thr_name()); utime_t lock_for_s(max_lock_secs, 0); const auto& lock_lambda = [&]() { diff --git a/src/rgw/rgw_lc.h b/src/rgw/rgw_lc.h index e08877a3513..8b3ab7c71d1 100644 --- a/src/rgw/rgw_lc.h +++ b/src/rgw/rgw_lc.h @@ -548,6 +548,11 @@ public: LCWorker(const DoutPrefixProvider* dpp, CephContext *_cct, RGWLC *_lc, int ix); RGWLC* get_lc() { return lc; } + + std::string thr_name() { + return std::string{"lc_thrd: "} + std::to_string(ix); + } + void *entry() override; void stop(); bool should_work(utime_t& now); -- 2.39.5