diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-30 06:29:27 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-30 06:29:27 +0000 |
commit | a1e0f60a68c8e5af9c3057ef6b1248043cdcaa08 (patch) | |
tree | a2d0a76e4f7eb0f8b0d98c652fc40b5924639e6d /searchcore | |
parent | 345d08b9ad7d7cffc3ebbb84a84b88bd0283f98e (diff) |
Avoid using sync_all_executors.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index fb9b10aa5a2..d3bbcda78f7 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -621,9 +621,16 @@ struct FixtureBase getFeedView().handleDeleteBucket(op); } - void performForceCommit() { getFeedView().forceCommit(serial); } + void performForceCommit(vespalib::IDestructorCallback::SP onDone) { + getFeedView().forceCommit(serial, std::move(onDone)); + } void forceCommitAndWait() { - runInMasterAndSyncAll([&]() { performForceCommit(); }); + vespalib::Gate gate; + runInMaster([this, onDone=std::make_shared<vespalib::GateCallback>(gate)]() { + performForceCommit(std::move(onDone)); + }); + gate.await(); + _writeService.master().sync(); } bool assertTrace(const vespalib::string &exp) { @@ -715,8 +722,7 @@ struct SearchableFeedViewFixture : public FixtureBase SearchableFeedView::Context(iw)) { } - ~SearchableFeedViewFixture() override - { + ~SearchableFeedViewFixture() override { forceCommitAndWait(); } IFeedView &getFeedView() override { return fv; } @@ -733,8 +739,7 @@ struct FastAccessFeedViewFixture : public FixtureBase FastAccessFeedView::Context(aw, _docIdLimit)) { } - ~FastAccessFeedViewFixture() override - { + ~FastAccessFeedViewFixture() override { forceCommitAndWait(); } IFeedView &getFeedView() override { return fv; } |