From 93aceff3649bacfdf39a8772b4605afe9b93a0e6 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Wed, 18 Aug 2021 10:12:36 +0000 Subject: Revert "only use "delete later" in notifyFailed callback" This reverts commit f2db94927e4738897725ff1c6839450096346297. --- slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'slobrok') diff --git a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp index c3d231db77e..5836118d37d 100644 --- a/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp +++ b/slobrok/src/vespa/slobrok/server/local_rpc_monitor_map.cpp @@ -84,6 +84,7 @@ void LocalRpcMonitorMap::add(const ServiceMapping &mapping) { if (removed.up) { _dispatcher.remove(removed.mapping()); } + _delete.later(std::move(removed.srv)); } auto [ iter, was_inserted ] = _map.try_emplace(mapping.name, globalService(mapping)); @@ -109,6 +110,7 @@ void LocalRpcMonitorMap::remove(const ServiceMapping &mapping) { if (removed.up) { _dispatcher.remove(removed.mapping()); } + _delete.later(std::move(removed.srv)); } else { LOG(debug, "tried to remove non-existing mapping %s->%s", mapping.name.c_str(), mapping.spec.c_str()); -- cgit v1.2.3