mds: add or update MDS thread names

To be consistent and sensical.

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>
(cherry picked from commit a2a989aaa5e9780d98ec9c5cabc66ac2c3a387a4)
Signed-off-by: Milind Changire <mchangir@redhat.com>
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)

diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc
index f70b27a2a10eaad587b3d178caca975945379739..e42665ba0d9f16627aec0e805f4d29ac1a2dc412 100644 (file)
--- 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<std::mutex> lock(mutex);
     bool sent;
     while (!finished) {

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index 392da0b10cb5c0248f59a2ef5dc119b1644dd225..52cd91b4625761dff4f55025010a0ee260862ba7 100644 (file)
--- 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 840a437337a31e47572cb3833a44d4f79be89e21..47c7c26fcdacfc9b28064b5aca365e2aaa91fd75 100644 (file)
--- 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 9cdd563e1e82333ad6bd775dff95e579fd196267..7d089e89b9cfd947f0342d3d7f3491c38225a6ba 100644 (file)
--- 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 6cdc3ab193e988cbd86e7b01390caffcc1ba6648..282bd50b00eeb1c35c9729d8e7c64aa3f2bcc811 100644 (file)
--- 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 b28b06b7ad294cbe0225b1d47ac3ea2d47c1dad4..1fd4de4d2cfd8c66cc03963f698536dcb905fe5e 100644 (file)
--- 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<std::chrono::seconds>("mds_metrics_update_interval").count();

diff --git a/src/mds/PurgeQueue.cc b/src/mds/PurgeQueue.cc
index 639c7e85277a60b9d81fd67b4754d459a5e76118..6ca74377933a6d3e54401bafc0bebd697a5127cb 100644 (file)
--- 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_),