Skip to content

Commit a2a989a

Browse files
committed
mds: add or update MDS thread names
To be consistent and sensical. Signed-off-by: Patrick Donnelly <[email protected]>
1 parent bfe489e commit a2a989a

File tree

9 files changed

+16
-11
lines changed

9 files changed

+16
-11
lines changed

src/mds/Beacon.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void Beacon::init(const MDSMap &mdsmap)
7474
_notify_mdsmap(mdsmap);
7575

7676
sender = std::thread([this]() {
77-
ceph_pthread_setname("beacon");
77+
ceph_pthread_setname("mds-beacon");
7878
std::unique_lock<std::mutex> lock(mutex);
7979
bool sent;
8080
while (!finished) {

src/mds/MDCache.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14378,6 +14378,7 @@ bool MDCache::is_ready_to_trim_cache(void)
1437814378

1437914379
void MDCache::upkeep_main(void)
1438014380
{
14381+
ceph_pthread_setname("mds-cache-trim");
1438114382
std::unique_lock lock(upkeep_mutex);
1438214383

1438314384
// create a "memory model" for the upkeep thread. The object maintains

src/mds/MDLog.cc

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ void MDLog::create(MDSContext *c)
258258
logger->set(l_mdl_expos, journaler->get_expire_pos());
259259
logger->set(l_mdl_wrpos, journaler->get_write_pos());
260260

261-
submit_thread.create("md_submit");
261+
submit_thread.create("mds-log-submit");
262262
}
263263

264264
void MDLog::open(MDSContext *c)
@@ -267,9 +267,9 @@ void MDLog::open(MDSContext *c)
267267

268268
ceph_assert(!recovery_thread.is_started());
269269
recovery_thread.set_completion(c);
270-
recovery_thread.create("md_recov_open");
270+
recovery_thread.create("mds-log-recvr");
271271

272-
submit_thread.create("md_submit");
272+
submit_thread.create("mds-log-submit");
273273
// either append() or replay() will follow.
274274
}
275275

@@ -311,7 +311,7 @@ void MDLog::reopen(MDSContext *c)
311311
recovery_thread.join();
312312

313313
recovery_thread.set_completion(new C_ReopenComplete(this, c));
314-
recovery_thread.create("md_recov_reopen");
314+
recovery_thread.create("mds-log-reopen");
315315
}
316316

317317
void MDLog::append()
@@ -657,6 +657,8 @@ void MDLog::try_to_commit_open_file_table(uint64_t last_seq)
657657
}
658658

659659
void MDLog::log_trim_upkeep(void) {
660+
ceph_pthread_setname("mds-log-trim");
661+
660662
dout(10) << dendl;
661663

662664
std::unique_lock mds_lock(mds->mds_lock);
@@ -1008,7 +1010,7 @@ void MDLog::replay(MDSContext *c)
10081010
}
10091011
already_replayed = true;
10101012

1011-
replay_thread.create("md_log_replay");
1013+
replay_thread.create("mds-log-replay");
10121014
}
10131015

10141016

src/mds/MDSRank.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ MDSRank::MDSRank(
496496

497497
objecter->unset_honor_pool_full();
498498

499-
finisher = new Finisher(cct, "MDSRank", "MR_Finisher");
499+
finisher = new Finisher(cct, "MDSRank", "mds-rank-fin");
500500

501501
mdcache = new MDCache(this, purge_queue);
502502
mdlog = new MDLog(this);
@@ -581,7 +581,7 @@ void MDSRankDispatcher::init()
581581
// who is interested in it.
582582
handle_osd_map();
583583

584-
progress_thread.create("mds_rank_progr");
584+
progress_thread.create("mds-rank-progr");
585585

586586
purge_queue.init();
587587

src/mds/MetricAggregator.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ int MetricAggregator::init() {
7373
m_cct->get_perfcounters_collection()->add(m_perf_counters);
7474

7575
pinger = std::thread([this]() {
76+
ceph_pthread_setname("mds-ping");
7677
std::unique_lock locker(lock);
7778
while (!stopping) {
7879
ping_all_active_ranks();

src/mds/MetricsHandler.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ void MetricsHandler::init() {
5151
dout(10) << dendl;
5252

5353
updater = std::thread([this]() {
54+
ceph_pthread_setname("mds-metrics");
5455
std::unique_lock locker(lock);
5556
while (!stopping) {
5657
double after = g_conf().get_val<std::chrono::seconds>("mds_metrics_update_interval").count();

src/mds/PurgeQueue.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ PurgeQueue::PurgeQueue(
122122
cct(cct_),
123123
rank(rank_),
124124
metadata_pool(metadata_pool_),
125-
finisher(cct, "PurgeQueue", "PQ_Finisher"),
125+
finisher(cct, "PurgeQueue", "mds-pq-fin"),
126126
timer(cct, lock),
127127
filer(objecter_, &finisher),
128128
objecter(objecter_),

src/mds/QuiesceAgent.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class QuiesceAgent {
3030
: quiesce_control(quiesce_control)
3131
, stop_agent_thread(false)
3232
, agent_thread(this) {
33-
agent_thread.create("quiesce.agt");
33+
agent_thread.create("mds-q-agt");
3434
};
3535

3636
virtual ~QuiesceAgent() {

src/mds/QuiesceDbManager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ void QuiesceDbManager::update_membership(const QuiesceClusterMembership& new_mem
200200
// start the thread
201201
dout(5) << "starting the db mgr thread at epoch: " << new_membership.epoch << dendl;
202202
db_thread_should_exit = false;
203-
quiesce_db_thread.create("quiesce_db_mgr");
203+
quiesce_db_thread.create("mds-q-db");
204204
} else if (quiesce_db_thread.is_started()) {
205205
submit_condition.notify_all();
206206
}

0 commit comments

Comments
 (0)