Revert "No need to notify if bucket is already locked"

1 files changed, 8 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index e8cc8a499a3..5886172b9cd 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -1114,7 +1114,14 @@ FileStorHandlerImpl::Stripe::schedule_and_get_next_async_message(MessageEntry en
     std::unique_lock guard(*_lock);
     _queue->emplace_back(std::move(entry));
     update_cached_queue_size(guard);
-    return get_next_async_message(guard);
+    auto lockedMessage = get_next_async_message(guard);
+    if ( ! lockedMessage.msg) {
+        if (guard.owns_lock()) {
+            guard.unlock();
+        }
+        _cond->notify_all();
+    }
+    return lockedMessage;
 }
 
 void