SERVER-37700 Remove thread names that include whitespaces

9 files changed, 9 insertions, 9 deletions

diff --git a/src/mongo/db/index_builder.cpp b/src/mongo/db/index_builder.cpp
index 75ada6a3b5f..791179e16fb 100644
--- a/src/mongo/db/index_builder.cpp
+++ b/src/mongo/db/index_builder.cpp
@@ -128,7 +128,7 @@ IndexBuilder::IndexBuilder(const BSONObj& index,
       _indexConstraints(indexConstraints),
       _replicatedWrites(replicatedWrites),
       _initIndexTs(initIndexTs),
-      _name(str::stream() << "repl index builder " << _indexBuildCount.addAndFetch(1)) {}
+      _name(str::stream() << "repl-index-builder-" << _indexBuildCount.addAndFetch(1)) {}
 
 IndexBuilder::~IndexBuilder() {}
 
diff --git a/src/mongo/db/keys_collection_manager.cpp b/src/mongo/db/keys_collection_manager.cpp
index d9881145edf..c21b4ab134b 100644
--- a/src/mongo/db/keys_collection_manager.cpp
+++ b/src/mongo/db/keys_collection_manager.cpp
@@ -157,7 +157,7 @@ void KeysCollectionManager::startMonitoring(ServiceContext* service) {
     _keysCache.resetCache();
     _refresher.setFunc([this](OperationContext* opCtx) { return _keysCache.refresh(opCtx); });
     _refresher.start(
-        service, str::stream() << "monitoring keys for " << _purpose, _keyValidForInterval);
+        service, str::stream() << "monitoring-keys-for-" << _purpose, _keyValidForInterval);
 }
 
 void KeysCollectionManager::stopMonitoring() {
diff --git a/src/mongo/db/repl/oplog_applier.cpp b/src/mongo/db/repl/oplog_applier.cpp
index 9d25e212065..403cf0d4364 100644
--- a/src/mongo/db/repl/oplog_applier.cpp
+++ b/src/mongo/db/repl/oplog_applier.cpp
@@ -79,7 +79,7 @@ std::unique_ptr<ThreadPool> OplogApplier::makeWriterPool() {
 // static
 std::unique_ptr<ThreadPool> OplogApplier::makeWriterPool(int threadCount) {
     ThreadPool::Options options;
-    options.threadNamePrefix = "repl writer worker ";
+    options.threadNamePrefix = "repl-writer-worker-";
     options.poolName = "repl writer worker Pool";
     options.maxThreads = options.minThreads = static_cast<size_t>(threadCount);
     options.onCreateThread = [](const std::string&) {
diff --git a/src/mongo/db/s/metadata_manager.cpp b/src/mongo/db/s/metadata_manager.cpp
index 61367820605..2add341ab7f 100644
--- a/src/mongo/db/s/metadata_manager.cpp
+++ b/src/mongo/db/s/metadata_manager.cpp
@@ -145,7 +145,7 @@ void scheduleCleanup(executor::TaskExecutor* executor,
     LOG(1) << "Scheduling cleanup on " << nss.ns() << " at " << when;
     auto swCallbackHandle = executor->scheduleWorkAt(
         when, [ executor, nss = std::move(nss), epoch = std::move(epoch) ](auto&) {
-            ThreadClient tc("Collection Range Deleter", getGlobalServiceContext());
+            ThreadClient tc("Collection-Range-Deleter", getGlobalServiceContext());
             auto uniqueOpCtx = Client::getCurrent()->makeOperationContext();
             auto opCtx = uniqueOpCtx.get();
 
diff --git a/src/mongo/db/s/session_catalog_migration_destination_test.cpp b/src/mongo/db/s/session_catalog_migration_destination_test.cpp
index a0817bad177..451ef2425cd 100644
--- a/src/mongo/db/s/session_catalog_migration_destination_test.cpp
+++ b/src/mongo/db/s/session_catalog_migration_destination_test.cpp
@@ -235,7 +235,7 @@ public:
             insertRequest.serialize({}, &insertBuilder);
             sessionInfo.serialize(&insertBuilder);
 
-            Client::initThread("test insert thread");
+            Client::initThread("test-insert-thread");
             auto innerOpCtx = Client::getCurrent()->makeOperationContext();
 
             // The ephemeral for test storage engine doesn't support document-level locking, so
diff --git a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_mongod.cpp b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_mongod.cpp
index 8b9e3114328..b1c921f0ccd 100644
--- a/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_mongod.cpp
+++ b/src/mongo/db/storage/wiredtiger/wiredtiger_record_store_mongod.cpp
@@ -63,7 +63,7 @@ class OplogTruncaterThread : public BackgroundJob {
 public:
     OplogTruncaterThread(const NamespaceString& ns)
         : BackgroundJob(true /* deleteSelf */), _ns(ns) {
-        _name = std::string("WT OplogTruncaterThread: ") + _ns.toString();
+        _name = std::string("WT-OplogTruncaterThread-") + _ns.toString();
     }
 
     virtual std::string name() const {
diff --git a/src/mongo/dbtests/deferred_writer.cpp b/src/mongo/dbtests/deferred_writer.cpp
index 4f985adb359..446c4eaeedc 100644
--- a/src/mongo/dbtests/deferred_writer.cpp
+++ b/src/mongo/dbtests/deferred_writer.cpp
@@ -71,7 +71,7 @@ static const NamespaceString kTestNamespace("unittests", "deferred_writer_tests"
 class RaiiWrapper {
 public:
     explicit RaiiWrapper(std::unique_ptr<DeferredWriter> writer) : _writer(std::move(writer)) {
-        _writer->startup("DeferredWriter test");
+        _writer->startup("DeferredWriter-test");
     }
 
     RaiiWrapper(RaiiWrapper&& other) : _writer(std::move(other._writer)) {}
diff --git a/src/mongo/s/client/shard_registry.cpp b/src/mongo/s/client/shard_registry.cpp
index c582dae2a05..ef02fb16186 100644
--- a/src/mongo/s/client/shard_registry.cpp
+++ b/src/mongo/s/client/shard_registry.cpp
@@ -251,7 +251,7 @@ void ShardRegistry::_internalReload(const CallbackArgs& cbArgs) {
         return;
     }
 
-    ThreadClient tc("shard registry reload", getGlobalServiceContext());
+    ThreadClient tc("shard-registry-reload", getGlobalServiceContext());
     auto opCtx = cc().makeOperationContext();
 
     try {
diff --git a/src/mongo/s/sharding_uptime_reporter.cpp b/src/mongo/s/sharding_uptime_reporter.cpp
index 108947a76b0..42c428dbefc 100644
--- a/src/mongo/s/sharding_uptime_reporter.cpp
+++ b/src/mongo/s/sharding_uptime_reporter.cpp
@@ -102,7 +102,7 @@ void ShardingUptimeReporter::startPeriodicThread() {
     invariant(!_thread.joinable());
 
     _thread = stdx::thread([] {
-        Client::initThread("Uptime reporter");
+        Client::initThread("Uptime-reporter");
 
         const std::string hostName(getHostNameCached());
         const std::string instanceId(constructInstanceIdString(hostName));