From 43dac43623cf3dc92d9e48ab9eb5f435cc04d2e6 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 21 Jan 2022 10:31:12 +0100 Subject: Fail-fast if reconfigurer thread is interrupted --- container-core/src/main/java/com/yahoo/container/di/Container.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'container-core') diff --git a/container-core/src/main/java/com/yahoo/container/di/Container.java b/container-core/src/main/java/com/yahoo/container/di/Container.java index e437f440c41..bb6b11c77ae 100644 --- a/container-core/src/main/java/com/yahoo/container/di/Container.java +++ b/container-core/src/main/java/com/yahoo/container/di/Container.java @@ -17,6 +17,7 @@ import com.yahoo.container.di.config.ApplicationBundlesConfig; import com.yahoo.container.di.config.PlatformBundlesConfig; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.vespa.config.ConfigKey; +import com.yahoo.yolean.UncheckedInterruptedException; import org.osgi.framework.Bundle; import java.util.ArrayList; @@ -153,7 +154,11 @@ public class Container { } private void constructComponents(ComponentGraph graph) { - graph.nodes().forEach(Node::constructInstance); + graph.nodes().forEach(n -> { + if (Thread.interrupted()) + throw new UncheckedInterruptedException("Interrupted while constructing component graph", true); + n.constructInstance(); + }); } private void deconstructObsoleteComponents(ComponentGraph oldGraph, -- cgit v1.2.3