diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-22 12:30:13 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-22 12:30:13 +0000 |
commit | 13098515fca1aff128a40e7450e405fb3f0fc841 (patch) | |
tree | 2b9fe357789ff6a75791bd5622d1b485b038f731 /searchcore | |
parent | d35d5d4a3614bfee4af9513de0bc779cf32455e1 (diff) |
Do not require sync of all executors
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index 09627dfa001..363c2925491 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -22,6 +22,7 @@ #include <vespa/searchcore/proton/test/threading_service_observer.h> #include <vespa/searchlib/attribute/attributefactory.h> #include <vespa/document/update/documentupdate.h> +#include <vespa/vespalib/util/destructor_callbacks.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/log/log.h> @@ -600,15 +601,17 @@ struct FixtureBase } } - void performMove(MoveOperation &op) { + void performMove(MoveOperation &op, IDestructorCallback::SP onDone) { op.setSerialNum(++serial); - getFeedView().handleMove(op, IDestructorCallback::SP()); + getFeedView().handleMove(op, std::move(onDone)); } void moveAndWait(const DocumentContext &docCtx, uint32_t fromLid, uint32_t toLid) { MoveOperation op(docCtx.bid, docCtx.ts, docCtx.doc, DbDocumentId(pc._params._subDbId, fromLid), pc._params._subDbId); op.setTargetLid(toLid); - runInMasterAndSyncAll([&]() { performMove(op); }); + vespalib::Gate gate; + runInMaster([&, onDone=std::make_shared<vespalib::GateCallback>(gate)]() { performMove(op, std::move(onDone)); }); + gate.await(); } void performDeleteBucket(DeleteBucketOperation &op) { |