diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-22 08:41:27 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-22 08:41:27 +0000 |
commit | e11dddef1805f23282170d4e872885d78310c061 (patch) | |
tree | 0d98f8906475280a40adc3301f428c73cec4db5b /searchcore | |
parent | 5320f639fa47dbf2e200476d572e8b82d0b74632 (diff) |
Go back to using sync
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp | 4 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp | 3 |
2 files changed, 4 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 54772f353d0..cda70729712 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -1130,7 +1130,7 @@ TEST_F("require that compactLidSpace() propagates to document meta store and doc f.compactLidSpaceAndWait(2); // performIndexForceCommit in index thread, then completion callback // in master thread. - EXPECT_TRUE(assertThreadObserver(7, 7, 7, f.writeServiceObserver())); + EXPECT_TRUE(assertThreadObserver(7, 6, 6, f.writeServiceObserver())); EXPECT_EQUAL(2u, f.metaStoreObserver()._compactLidSpaceLidLimit); EXPECT_EQUAL(2u, f.getDocumentStore()._compactLidSpaceLidLimit); EXPECT_EQUAL(1u, f.metaStoreObserver()._holdUnblockShrinkLidSpaceCnt); @@ -1148,7 +1148,7 @@ TEST_F("require that compactLidSpace() doesn't propagate to " op.setSerialNum(0); f.runInMasterAndSync([&]() { f.fv.handleCompactLidSpace(op); }); // Delayed holdUnblockShrinkLidSpace() in index thread, then master thread - EXPECT_TRUE(assertThreadObserver(6, 6, 5, f.writeServiceObserver())); + EXPECT_TRUE(assertThreadObserver(6, 5, 4, f.writeServiceObserver())); EXPECT_EQUAL(0u, f.metaStoreObserver()._compactLidSpaceLidLimit); EXPECT_EQUAL(0u, f.getDocumentStore()._compactLidSpaceLidLimit); EXPECT_EQUAL(0u, f.metaStoreObserver()._holdUnblockShrinkLidSpaceCnt); diff --git a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp index e2b3887c60c..db2bb7ed2cb 100644 --- a/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/fast_access_feed_view.cpp @@ -6,6 +6,7 @@ #include "removedonecontext.h" #include "putdonecontext.h" #include <vespa/searchcore/proton/feedoperation/operations.h> +#include <vespa/vespalib/util/isequencedtaskexecutor.h> using document::Document; using document::DocumentUpdate; @@ -72,7 +73,7 @@ void FastAccessFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op) { // Drain pending PutDoneContext and ForceCommitContext objects - forceCommitAndWait(search::CommitParam(op.getSerialNum())); + _writeService.sync_all_executors(); _docIdLimit.set(op.getLidLimit()); getAttributeWriter()->compactLidSpace(op.getLidLimit(), op.getSerialNum()); Parent::handleCompactLidSpace(op); |