summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2023-01-12 14:48:08 +0100
committerGitHub <noreply@github.com>2023-01-12 14:48:08 +0100
commit7691f844382596449a34af633819208f69b2c020 (patch)
tree162a797567a3788de72961ddedad1fc2643d7694 /storage
parent2abd22d3f855d8ed12a8872e612df91492dd8a85 (diff)
parent4c10c550e96635d3a14abfca560064ec085b74ab (diff)
Merge pull request #25537 from vespa-engine/balder/no-need-to-notify-if-bucket-is-locked
No need to notify if bucket is already locked
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp9
1 files changed, 1 insertions, 8 deletions
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 1c245d9c38e..834b3dfa48e 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -1116,14 +1116,7 @@ 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);
- auto lockedMessage = get_next_async_message(guard);
- if ( ! lockedMessage.msg) {
- if (guard.owns_lock()) {
- guard.unlock();
- }
- _cond->notify_all();
- }
- return lockedMessage;
+ return get_next_async_message(guard);
}
void