diff options
author | Tor Egge <Tor.Egge@broadpark.no> | 2019-10-08 12:09:24 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@broadpark.no> | 2019-10-08 12:12:07 +0200 |
commit | e33e18b3893e827f1bcc1d5e71c1762e1f871108 (patch) | |
tree | decb0d68b71d6b96b7658b072d0a58043165b52f /searchcore | |
parent | 7fdcde5427339d785d9530ee76b634665144977a (diff) |
Use summary executor for compactLidSpace() on docstore.
Diffstat (limited to 'searchcore')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index 2bb17c54367..b519e6a8dc7 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -1146,7 +1146,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, 5, 3, f.writeServiceObserver())); + EXPECT_TRUE(assertThreadObserver(7, 5, 4, f.writeServiceObserver())); EXPECT_EQUAL(2u, f.metaStoreObserver()._compactLidSpaceLidLimit); EXPECT_EQUAL(2u, f.getDocumentStore()._compactLidSpaceLidLimit); EXPECT_EQUAL(1u, f.metaStoreObserver()._holdUnblockShrinkLidSpaceCnt); diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index d441e6cd22a..54942b4ba11 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -786,7 +786,8 @@ StoreOnlyFeedView::handleCompactLidSpace(const CompactLidSpaceOperation &op) forceCommit(serialNum, commitContext); } if (useDocumentStore(serialNum)) { - _summaryAdapter->compactLidSpace(op.getLidLimit()); + _writeService.summary().execute(makeLambdaTask([this, &op]() { _summaryAdapter->compactLidSpace(op.getLidLimit()); })); + _writeService.summary().sync(); } } |