summaryrefslogtreecommitdiffstats
path: root/container-disc
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2023-06-26 09:24:34 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2023-06-26 09:24:34 +0200
commit0cfcb18a58f9023182349845a215d3119fce43aa (patch)
tree2c5e90d11115a4abde55b663a605b54d31766399 /container-disc
parentc56f65ac7fde9c5da5c05ca5b765be1be0b25934 (diff)
Reduce dtor timeout to less than global reconfig timeout
Diffstat (limited to 'container-disc')
-rw-r--r--container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
index 5fc2032bec2..47050168b80 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java
@@ -161,7 +161,7 @@ public class DataplaneProxyService extends AbstractComponent {
super.deconstruct();
wantedState = NginxState.STOPPED;
try {
- executorService.awaitTermination(5, TimeUnit.MINUTES);
+ executorService.awaitTermination(30, TimeUnit.SECONDS);
} catch (InterruptedException e) {
logger.log(Level.WARNING, "Error shutting down proxy reload thread", e);
}