From a2a989aaa5e9780d98ec9c5cabc66ac2c3a387a4 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 --- src/mds/Beacon.cc | 2 +- src/mds/MDCache.cc | 1 + src/mds/MDLog.cc | 12 +++++++----- src/mds/MDSRank.cc | 4 ++-- src/mds/MetricAggregator.cc | 1 + src/mds/MetricsHandler.cc | 1 + src/mds/PurgeQueue.cc | 2 +- src/mds/QuiesceAgent.h | 2 +- src/mds/QuiesceDbManager.cc | 2 +- 9 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc index d79e6f3b8cb..560d606fa33 100644 --- a/src/mds/Beacon.cc +++ b/src/mds/Beacon.cc @@ -74,7 +74,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 eb2b529dcfa..35e1a10f866 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -14378,6 +14378,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); // create a "memory model" for the upkeep thread. The object maintains diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc index 0be568433ef..0eacbfd94a7 100644 --- a/src/mds/MDLog.cc +++ b/src/mds/MDLog.cc @@ -258,7 +258,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) @@ -267,9 +267,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. } @@ -311,7 +311,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() @@ -657,6 +657,8 @@ void MDLog::try_to_commit_open_file_table(uint64_t last_seq) } void MDLog::log_trim_upkeep(void) { + ceph_pthread_setname("mds-log-trim"); + dout(10) << dendl; std::unique_lock mds_lock(mds->mds_lock); @@ -1008,7 +1010,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 c2f3544f97b..3b73105f3e6 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -496,7 +496,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); @@ -581,7 +581,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 1d17bbf3e92..6cbd9a094c0 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 9ad10b9d6e6..9fc4c6122a4 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 925bff16542..4426d3ca6fe 100644 --- a/src/mds/PurgeQueue.cc +++ b/src/mds/PurgeQueue.cc @@ -122,7 +122,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_), diff --git a/src/mds/QuiesceAgent.h b/src/mds/QuiesceAgent.h index 5c07d6d8074..85900e8e71b 100644 --- a/src/mds/QuiesceAgent.h +++ b/src/mds/QuiesceAgent.h @@ -30,7 +30,7 @@ class QuiesceAgent { : quiesce_control(quiesce_control) , stop_agent_thread(false) , agent_thread(this) { - agent_thread.create("quiesce.agt"); + agent_thread.create("mds-q-agt"); }; virtual ~QuiesceAgent() { diff --git a/src/mds/QuiesceDbManager.cc b/src/mds/QuiesceDbManager.cc index 12c83634e54..bb3ae93e378 100644 --- a/src/mds/QuiesceDbManager.cc +++ b/src/mds/QuiesceDbManager.cc @@ -200,7 +200,7 @@ void QuiesceDbManager::update_membership(const QuiesceClusterMembership& new_mem // start the thread dout(5) << "starting the db mgr thread at epoch: " << new_membership.epoch << dendl; db_thread_should_exit = false; - quiesce_db_thread.create("quiesce_db_mgr"); + quiesce_db_thread.create("mds-q-db"); } else if (quiesce_db_thread.is_started()) { submit_condition.notify_all(); } -- 2.39.5