summaryrefslogtreecommitdiffstats
path: root/persistence
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-01-22 18:49:13 +0100
committerGitHub <noreply@github.com>2021-01-22 18:49:13 +0100
commit696ee4a7d60370b93613bfe2d3e786e3be5a1ac5 (patch)
tree54ec1e2251cf23d1c9bc84942e73901c56f61d84 /persistence
parent724c57cb13aadf085fc98971009086f7d08792e6 (diff)
parent7008026d0058282fc67000e8f66e0eedcc337372 (diff)
Merge pull request #16164 from vespa-engine/balder/split-test
- Splitt common test code.
Diffstat (limited to 'persistence')
-rw-r--r--persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
index 8730e25e52b..9aa647fcc65 100644
--- a/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
+++ b/persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp
@@ -24,14 +24,14 @@ DummyBucketExecutor::~DummyBucketExecutor() {
std::unique_ptr<BucketTask>
DummyBucketExecutor::execute(const Bucket & bucket, std::unique_ptr<BucketTask> task) {
- {
- std::unique_lock guard(_lock);
- while (_inFlight.contains(bucket.getBucket())) {
- _cond.wait(guard);
- }
- _inFlight.insert(bucket.getBucket());
- }
_executor->execute(makeLambdaTask([this, bucket, bucketTask=std::move(task)]() {
+ {
+ std::unique_lock guard(_lock);
+ while (_inFlight.contains(bucket.getBucket())) {
+ _cond.wait(guard);
+ }
+ _inFlight.insert(bucket.getBucket());
+ }
bucketTask->run(bucket, makeLambdaCallback([this, bucket]() {
std::unique_lock guard(_lock);
assert(_inFlight.contains(bucket.getBucket()));