Reduce shutdown deconstruction timeout from 10 min -> 45 sec

.. due to ConfiguredApplication.shutdownDeadlineExecutor

1 files changed, 3 insertions, 1 deletions

diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
index b5f9e674502..d6a241c30c9 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/component/Deconstructor.java
@@ -38,7 +38,9 @@ public class Deconstructor implements ComponentDeconstructor {
     private static final Logger log = Logger.getLogger(Deconstructor.class.getName());
 
     private static final Duration RECONFIG_DECONSTRUCT_DELAY = Duration.ofSeconds(60);
-    private static final Duration SHUTDOWN_DECONSTRUCT_TIMEOUT = Duration.ofMinutes(10);
+
+    // This must be smaller than the shutdownDeadlineExecutor delay in ConfiguredApplication
+    private static final Duration SHUTDOWN_DECONSTRUCT_TIMEOUT = Duration.ofSeconds(45);
 
     public enum Mode {
         RECONFIG,  // Delay deconstruction to allow old components to finish processing in-flight requests.