Name the threads so it is easier to see who is doing what.

3 files changed, 21 insertions, 11 deletions

diff --git a/storage/src/tests/common/teststorageapp.cpp b/storage/src/tests/common/teststorageapp.cpp
index 1a6201d8aa3..e904f690bde 100644
--- a/storage/src/tests/common/teststorageapp.cpp
+++ b/storage/src/tests/common/teststorageapp.cpp
@@ -125,14 +125,16 @@ TestStorageApp::waitUntilInitialized(
 }
 
 namespace {
-    NodeIndex getIndexFromConfig(vespalib::stringref configId) {
-        if (!configId.empty()) {
-            config::ConfigUri uri(configId);
-            return NodeIndex(
-                config::ConfigGetter<vespa::config::content::core::StorServerConfig>::getConfig(uri.getConfigId(), uri.getContext())->nodeIndex);
-        }
-        return NodeIndex(0);
+NodeIndex getIndexFromConfig(vespalib::stringref configId) {
+    if (!configId.empty()) {
+        config::ConfigUri uri(configId);
+        return NodeIndex(
+            config::ConfigGetter<vespa::config::content::core::StorServerConfig>::getConfig(uri.getConfigId(), uri.getContext())->nodeIndex);
     }
+    return NodeIndex(0);
+}
+
+VESPA_THREAD_STACK_TAG(test_executor)
 }
 
 TestServiceLayerApp::TestServiceLayerApp(vespalib::stringref configId)
@@ -140,7 +142,7 @@ TestServiceLayerApp::TestServiceLayerApp(vespalib::stringref configId)
                      lib::NodeType::STORAGE, getIndexFromConfig(configId), configId),
       _compReg(dynamic_cast<ServiceLayerComponentRegisterImpl&>(TestStorageApp::getComponentRegister())),
       _persistenceProvider(),
-      _executor(vespalib::SequencedTaskExecutor::create(1))
+      _executor(vespalib::SequencedTaskExecutor::create(test_executor, 1))
 {
     lib::NodeState ns(*_nodeStateUpdater.getReportedNodeState());
     _nodeStateUpdater.setReportedNodeState(ns);
@@ -152,7 +154,7 @@ TestServiceLayerApp::TestServiceLayerApp(NodeIndex index,
                      lib::NodeType::STORAGE, index, configId),
       _compReg(dynamic_cast<ServiceLayerComponentRegisterImpl&>(TestStorageApp::getComponentRegister())),
       _persistenceProvider(),
-      _executor(vespalib::SequencedTaskExecutor::create(1))
+      _executor(vespalib::SequencedTaskExecutor::create(test_executor, 1))
 {
     lib::NodeState ns(*_nodeStateUpdater.getReportedNodeState());
     _nodeStateUpdater.setReportedNodeState(ns);
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index 489f58fbcc0..47e516a1dcc 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -88,9 +88,11 @@ PersistenceTestUtils::dumpBucket(const document::BucketId& bid) {
     return dynamic_cast<spi::dummy::DummyPersistence&>(_env->_node.getPersistenceProvider()).dumpBucket(makeSpiBucket(bid));
 }
 
+VESPA_THREAD_STACK_TAG(test_executor)
+
 void
 PersistenceTestUtils::setupExecutor(uint32_t numThreads) {
-    _sequenceTaskExecutor = vespalib::SequencedTaskExecutor::create(numThreads, 1000, vespalib::Executor::OptimizeFor::ADAPTIVE);
+    _sequenceTaskExecutor = vespalib::SequencedTaskExecutor::create(test_executor, numThreads, 1000, vespalib::Executor::OptimizeFor::ADAPTIVE);
 }
 
 document::Document::SP
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 8e1ee6cbb3a..0655a8fde7a 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -29,6 +29,11 @@ using std::shared_ptr;
 using document::BucketSpace;
 using vespalib::make_string_short::fmt;
 
+namespace {
+
+VESPA_THREAD_STACK_TAG(response_executor)
+
+}
 namespace storage {
 
 FileStorManager::
@@ -164,7 +169,8 @@ FileStorManager::configure(std::unique_ptr<vespa::config::content::StorFilestorC
 
         _filestorHandler = std::make_unique<FileStorHandlerImpl>(numThreads, numStripes, *this, *_metrics, _compReg);
         uint32_t numResponseThreads = computeNumResponseThreads(_config->numResponseThreads);
-        _sequencedExecutor = vespalib::SequencedTaskExecutor::create(numResponseThreads, 10000, selectSequencer(_config->responseSequencerType));
+        _sequencedExecutor = vespalib::SequencedTaskExecutor::create(response_executor, numResponseThreads, 10000,
+                                                                     selectSequencer(_config->responseSequencerType));
         assert(_sequencedExecutor);
         LOG(spam, "Setting up the disk");
         for (uint32_t i = 0; i < numThreads; i++) {