1 files changed, 11 insertions, 2 deletions
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index baed51663f8..407bef5f8bc 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -284,19 +284,21 @@ struct FileStorHandlerComponents {
 FileStorHandlerComponents::~FileStorHandlerComponents() = default;
 
 struct PersistenceHandlerComponents : public FileStorHandlerComponents {
+    vespalib::ISequencedTaskExecutor& executor;
     ServiceLayerComponent component;
     BucketOwnershipNotifier bucketOwnershipNotifier;
     std::unique_ptr<PersistenceHandler> persistenceHandler;
 
     PersistenceHandlerComponents(FileStorTestBase& test)
         : FileStorHandlerComponents(test),
+          executor(test._node->executor()),
           component(test._node->getComponentRegister(), "test"),
           bucketOwnershipNotifier(component, messageSender),
           persistenceHandler()
     {
         vespa::config::content::StorFilestorConfig cfg;
         persistenceHandler =
-                std::make_unique<PersistenceHandler>(test._node->executor(), component, cfg,
+                std::make_unique<PersistenceHandler>(executor, component, cfg,
                                                      test._node->getPersistenceProvider(),
                                                      *filestorHandler, bucketOwnershipNotifier,
                                                      *metrics.disk->threads[0]);
@@ -307,7 +309,12 @@ struct PersistenceHandlerComponents : public FileStorHandlerComponents {
     }
 };
 
-PersistenceHandlerComponents::~PersistenceHandlerComponents() = default;
+PersistenceHandlerComponents::~PersistenceHandlerComponents()
+{
+    // Ensure any pending tasks have completed before destroying any resources they
+    // may implicitly depend on.
+    executor.sync_all();
+}
 
 }
 
@@ -811,6 +818,8 @@ TEST_F(FileStorManagerTest, priority) {
     // Closing file stor handler before threads are deleted, such that
     // file stor threads getNextMessage calls returns.
     filestorHandler.close();
+    // Sync any tasks that may be pending for the handlers on the stack.
+    _node->executor().sync_all();
 }
 
 TEST_F(FileStorManagerTest, split1) {