From 9bf583ded043ccdd6db2d449cd7e80f7494075be Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 24 Oct 2024 14:00:10 -0400 Subject: [PATCH] mds: add or update MDS thread names To be consistent and sensical. Signed-off-by: Patrick Donnelly (cherry picked from commit a2a989aaa5e9780d98ec9c5cabc66ac2c3a387a4) Signed-off-by: Milind Changire Conflicts: src/mds/MDLog.cc (no upkeep thread in reef) src/mds/QuiesceAgent.h (not available in reef) src/mds/QuiesceDbManager.cc (not available in reef) --- src/mds/Beacon.cc | 2 +- src/mds/MDCache.cc | 1 + src/mds/MDLog.cc | 10 +++++----- src/mds/MDSRank.cc | 4 ++-- src/mds/MetricAggregator.cc | 1 + src/mds/MetricsHandler.cc | 1 + src/mds/PurgeQueue.cc | 2 +- 7 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc index f70b27a2a10ea..e42665ba0d9f1 100644 --- a/src/mds/Beacon.cc +++ b/src/mds/Beacon.cc @@ -73,7 +73,7 @@ void Beacon::init(const MDSMap &mdsmap) _notify_mdsmap(mdsmap); sender = std::thread([this]() { - ceph_pthread_setname("beacon"); + ceph_pthread_setname("mds-beacon"); std::unique_lock lock(mutex); bool sent; while (!finished) { diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 392da0b10cb5c..52cd91b462576 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -13496,6 +13496,7 @@ bool MDCache::is_ready_to_trim_cache(void) void MDCache::upkeep_main(void) { + ceph_pthread_setname("mds-cache-trim"); std::unique_lock lock(upkeep_mutex); while (!upkeep_trim_shutdown.load()) { auto now = clock::now(); diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 840a437337a31..47c7c26fcdacf 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -183,7 +183,7 @@ void MDLog::create(MDSContext *c) logger->set(l_mdl_expos, journaler->get_expire_pos()); logger->set(l_mdl_wrpos, journaler->get_write_pos()); - submit_thread.create("md_submit"); + submit_thread.create("mds-log-submit"); } void MDLog::open(MDSContext *c) @@ -192,9 +192,9 @@ void MDLog::open(MDSContext *c) ceph_assert(!recovery_thread.is_started()); recovery_thread.set_completion(c); - recovery_thread.create("md_recov_open"); + recovery_thread.create("mds-log-recvr"); - submit_thread.create("md_submit"); + submit_thread.create("mds-log-submit"); // either append() or replay() will follow. } @@ -236,7 +236,7 @@ void MDLog::reopen(MDSContext *c) recovery_thread.join(); recovery_thread.set_completion(new C_ReopenComplete(this, c)); - recovery_thread.create("md_recov_reopen"); + recovery_thread.create("mds-log-reopen"); } void MDLog::append() @@ -939,7 +939,7 @@ void MDLog::replay(MDSContext *c) } already_replayed = true; - replay_thread.create("md_log_replay"); + replay_thread.create("mds-log-replay"); } diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 9cdd563e1e823..7d089e89b9cfd 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -530,7 +530,7 @@ MDSRank::MDSRank( objecter->unset_honor_pool_full(); - finisher = new Finisher(cct, "MDSRank", "MR_Finisher"); + finisher = new Finisher(cct, "MDSRank", "mds-rank-fin"); mdcache = new MDCache(this, purge_queue); mdlog = new MDLog(this); @@ -613,7 +613,7 @@ void MDSRankDispatcher::init() // who is interested in it. handle_osd_map(); - progress_thread.create("mds_rank_progr"); + progress_thread.create("mds-rank-progr"); purge_queue.init(); diff --git a/src/mds/MetricAggregator.cc b/src/mds/MetricAggregator.cc index 6cdc3ab193e98..282bd50b00eeb 100644 --- a/src/mds/MetricAggregator.cc +++ b/src/mds/MetricAggregator.cc @@ -73,6 +73,7 @@ int MetricAggregator::init() { m_cct->get_perfcounters_collection()->add(m_perf_counters); pinger = std::thread([this]() { + ceph_pthread_setname("mds-ping"); std::unique_lock locker(lock); while (!stopping) { ping_all_active_ranks(); diff --git a/src/mds/MetricsHandler.cc b/src/mds/MetricsHandler.cc index b28b06b7ad294..1fd4de4d2cfd8 100644 --- a/src/mds/MetricsHandler.cc +++ b/src/mds/MetricsHandler.cc @@ -51,6 +51,7 @@ void MetricsHandler::init() { dout(10) << dendl; updater = std::thread([this]() { + ceph_pthread_setname("mds-metrics"); std::unique_lock locker(lock); while (!stopping) { double after = g_conf().get_val("mds_metrics_update_interval").count(); diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc index 639c7e85277a6..6ca74377933a6 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -111,7 +111,7 @@ PurgeQueue::PurgeQueue( cct(cct_), rank(rank_), metadata_pool(metadata_pool_), - finisher(cct, "PurgeQueue", "PQ_Finisher"), + finisher(cct, "PurgeQueue", "mds-pq-fin"), timer(cct, lock), filer(objecter_, &finisher), objecter(objecter_), -- 2.39.5