diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-22 09:07:46 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-01-22 13:30:39 +0000 |
commit | 51defae5f1a7e974488f3299e0a564cb37f403e4 (patch) | |
tree | 5944358d50dd9685875b06855f97897d7f869702 /persistence | |
parent | 33e3448242a228348859caff51fa49f635192f59 (diff) |
- Splitt common test code.
- Splitt out HandlerTest.
- Make JobTest parameterized to run with current way of using frozen bucket concept, or future using BucketExecutor and content layer bucket locking.
Diffstat (limited to 'persistence')
-rw-r--r-- | persistence/src/vespa/persistence/dummyimpl/dummy_bucket_executor.cpp | 14 |
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())); |