From 0cfcb18a58f9023182349845a215d3119fce43aa Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@yahooinc.com>
Date: Mon, 26 Jun 2023 09:24:34 +0200
Subject: Reduce dtor timeout to less than global reconfig timeout

---
 .../src/main/java/com/yahoo/container/jdisc/DataplaneProxyService.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'container-disc')

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);
         }
-- 
cgit v1.2.3