summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2017-10-17 22:47:53 +0200
committerGitHub <noreply@github.com>2017-10-17 22:47:53 +0200
commit2e60b8217b93fc9222ec00422de9ff909b775b42 (patch)
tree9410c627b4f0ebaec3facfdd245689c33caa6abf
parentcc127a3c898b5f5ff3d1711a656ad4ca72ef7562 (diff)
parent41df932540ac7ffebdc4a9dbc213efbc0838f224 (diff)
Merge pull request #3798 from vespa-engine/revert-3795-balder/wire-in-a-destructor-callback
Revert "Use the existing sync method."
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index 60e604e1b23..5890489415e 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -577,7 +577,9 @@ performPruneRemovedDocuments(PruneRemovedDocumentsOperation &pruneOp)
{
const LidVectorContext::SP lids_to_remove = pruneOp.getLidsToRemove();
if (lids_to_remove && lids_to_remove->getNumLids() != 0) {
- storeOperationSync(pruneOp);
+ vespalib::Gate gate;
+ storeOperation(pruneOp, std::make_shared<search::GateCallback>(gate));
+ gate.await();
_activeFeedView->handlePruneRemovedDocuments(pruneOp);
}
}