summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Brede Vekterli <vekterli@yahooinc.com>2022-05-19 14:20:55 +0200
committerGitHub <noreply@github.com>2022-05-19 14:20:55 +0200
commitc8eee5331f59fef5169fc893674466a75d5dbe4f (patch)
tree55c618e09cd8402d7b4f8b99f33892edf523216b /storage
parent340f78ced167cc2bbf02c7541664b0c305b6a1e9 (diff)
parentbeca1897784414e3353f68613f65b53c7d1a7ee7 (diff)
Merge pull request #22662 from vespa-engine/havardpe/delay-slobrok-register-destruction
delay destruction of the slobrok register component
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
index 7ad59ee574c..c98617c84bf 100644
--- a/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
+++ b/storage/src/vespa/storage/storageserver/rpc/shared_rpc_resources.cpp
@@ -115,7 +115,6 @@ void SharedRpcResources::shutdown() {
std::this_thread::sleep_for(10ms);
}
}
- _slobrok_register.reset(); // Implicitly kill any pending slobrok tasks prior to shutting down transport layer
_transport->ShutDown(true);
// FIXME need to reset to break weak_ptrs? But ShutDown should already sync pending resolves...!
_shutdown = true;