Merge pull request #25323 from vespa-engine/balder/move-close-prior-to-join

Move close() call up between interrupt() and join().

1 files changed, 3 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
index 49b3b02e240..b67e4851473 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp
@@ -105,13 +105,14 @@ FileStorManager::~FileStorManager()
             thread->getThread().interrupt();
         }
     }
+    LOG(debug, "Closing all filestor queues, answering queued messages. New messages will be refused.");
+    _filestorHandler->close();
     for (const auto & thread : _threads) {
         if (thread) {
             thread->getThread().join();
         }
     }
-    LOG(debug, "Closing all filestor queues, answering queued messages. New messages will be refused.");
-    _filestorHandler->close();
+
     LOG(debug, "Deleting filestor threads. Waiting for their current operation "
                "to finish. Stop their threads and delete objects.");
     _threads.clear();