From a1e0f60a68c8e5af9c3057ef6b1248043cdcaa08 Mon Sep 17 00:00:00 2001
From: Henning Baldersheim <balder@yahoo-inc.com>
Date: Tue, 30 Nov 2021 06:29:27 +0000
Subject: Avoid using sync_all_executors.

---
 .../tests/proton/documentdb/feedview/feedview_test.cpp  | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp')

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; }
-- 
cgit v1.2.3