Merge pull request #20975 from vespa-engine/vekterli/avoid-core-on-aborted-node-startup

Avoid assertion failure on aborted node startup

1 files changed, 3 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
index 3ad34a94726..90f7f292a6d 100644
--- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp
@@ -97,7 +97,9 @@ ModifiedBucketChecker::onClose()
     if (_singleThreadMode) {
         return;
     }
-    assert(_thread);
+    if (!_thread) {
+        return; // Aborted startup; onOpen() was never called so there's nothing to close.
+    }
     LOG(debug, "Interrupting modified bucket checker thread");
     _thread->interrupt();
     _cond.notify_one();