summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-09-18 13:52:09 +0200
committerGitHub <noreply@github.com>2020-09-18 13:52:09 +0200
commit72f183772b0dd0306e14ef9639e80592440d6898 (patch)
tree9819e9fe00d4cdcde21ed88cbbb9147a52df5593
parentffece1d93335a9cff4674b883a569c2853a9b820 (diff)
parent28eb194406557aba3f91e1c98565b15c4ebe2097 (diff)
Merge pull request #14446 from vespa-engine/hmusum/shutdown-transport-later
Shut down transport after rpc executor
-rw-r--r--config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
index a19d5809660..30f4884c737 100644
--- a/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
+++ b/config-proxy/src/main/java/com/yahoo/vespa/config/proxy/ConfigProxyRpcServer.java
@@ -60,13 +60,13 @@ public class ConfigProxyRpcServer implements Runnable, TargetWatcher, RpcServer
}
void shutdown() {
- supervisor.transport().shutdown();
try {
rpcExecutor.shutdownNow();
rpcExecutor.awaitTermination(10, TimeUnit.SECONDS);
} catch (InterruptedException e) {
throw new RuntimeException(e);
}
+ supervisor.transport().shutdown();
}
Spec getSpec() {