summaryrefslogtreecommitdiffstats
path: root/searchcore/src/vespa/searchcore/proton/server/proton.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'searchcore/src/vespa/searchcore/proton/server/proton.cpp')
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/proton.cpp8
1 files changed, 2 insertions, 6 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
index 89940fbf367..30a23aaa3d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp
@@ -447,11 +447,7 @@ Proton::~Proton()
_flushEngine->close();
}
if (_shared_service) {
- _shared_service->warmup_raw().sync();
- _shared_service->shared_raw()->sync();
- if (_shared_service->field_writer()) {
- _shared_service->field_writer()->sync_all();
- }
+ _shared_service->sync_all_executors();
}
if ( ! _documentDBMap.empty()) {
@@ -946,7 +942,7 @@ Proton::get_child(vespalib::stringref name) const
return std::make_unique<ResourceUsageExplorer>(_diskMemUsageSampler->writeFilter(),
_persistenceEngine->get_resource_usage_tracker());
} else if (name == THREAD_POOLS) {
- return std::make_unique<ProtonThreadPoolsExplorer>((_shared_service) ? _shared_service->shared_raw().get() : nullptr,
+ return std::make_unique<ProtonThreadPoolsExplorer>((_shared_service) ? &_shared_service->shared() : nullptr,
(_matchEngine) ? &_matchEngine->get_executor() : nullptr,
(_summaryEngine) ? &_summaryEngine->get_executor() : nullptr,
(_flushEngine) ? &_flushEngine->get_executor() : nullptr,