Split the persistence thread and the message handler.

- Let FileStorManager own and control the Component and PersistenceHandler
  separately from the Persistence thread.
- Let FileStorManager allocate and control stripe assignment.

1 files changed, 6 insertions, 10 deletions

diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index e2d61b9db2c..80ba4c19384 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -70,9 +70,14 @@ PersistenceTestEnvironment::~PersistenceTestEnvironment() {
 PersistenceTestUtils::PersistenceTestUtils()
     : _env(std::make_unique<PersistenceTestEnvironment>("todo-make-unique-persistencetestutils")),
       _replySender(),
-      _bucketOwnershipNotifier(getEnv()._component, getEnv()._fileStorHandler)
+      _bucketOwnershipNotifier(getEnv()._component, getEnv()._fileStorHandler),
+      _persistenceHandler()
 {
     setupExecutor(1);
+    vespa::config::content::StorFilestorConfig cfg;
+    _persistenceHandler = std::make_unique<PersistenceHandler>(*_sequenceTaskExecutor, _env->_component, cfg,
+                                                               getPersistenceProvider(), getEnv()._fileStorHandler,
+                                                               _bucketOwnershipNotifier, getEnv()._metrics);
 }
 PersistenceTestUtils::~PersistenceTestUtils() = default;
 
@@ -86,15 +91,6 @@ PersistenceTestUtils::setupExecutor(uint32_t numThreads) {
     _sequenceTaskExecutor = vespalib::SequencedTaskExecutor::create(numThreads, 1000, vespalib::Executor::OptimizeFor::ADAPTIVE);
 }
 
-std::unique_ptr<PersistenceThread>
-PersistenceTestUtils::createPersistenceThread()
-{
-    vespa::config::content::StorFilestorConfig cfg;
-    return std::make_unique<PersistenceThread>(*_sequenceTaskExecutor, _env->_node.getComponentRegister(),
-                                               cfg, getPersistenceProvider(),
-                                               getEnv()._fileStorHandler, _bucketOwnershipNotifier, getEnv()._metrics);
-}
-
 document::Document::SP
 PersistenceTestUtils::schedulePut(
         uint32_t location,