summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2023-01-27 20:47:27 +0000
committerArne Juul <arnej@yahooinc.com>2023-01-27 20:47:43 +0000
commitdb5dc5204e7336bf738a96c003fbb456e4a4838b (patch)
tree7868f6c7ae90998ea5a9bcc5e83f08b128dddcda
parentdd81671f4a11b081cf7e2b8e9ae0ebd077ea1a77 (diff)
detect controlled shutdown
-rw-r--r--container-core/src/main/java/com/yahoo/container/di/Container.java6
1 files changed, 5 insertions, 1 deletions
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 8e9874f272e..6c512be0d30 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
@@ -75,7 +75,11 @@ public class Container {
newGraph = waitForNewConfigGenAndCreateGraph(oldGraph, fallbackInjector, isInitializing);
newGraph.reuseNodes(oldGraph);
} catch (Throwable t) {
- log.warning("Failed to set up component graph - uninstalling latest bundles. Bootstrap generation: " + getBootstrapGeneration());
+ if (t instanceof SubscriberClosedException) {
+ log.fine("Closing down waitForNextGraphGeneration()");
+ } else {
+ log.warning("Failed to set up component graph - uninstalling latest bundles. Bootstrap generation: " + getBootstrapGeneration());
+ }
Collection<Bundle> newBundlesFromFailedGen = osgi.completeBundleGeneration(Osgi.GenerationStatus.FAILURE);
deconstructComponentsAndBundles(getBootstrapGeneration(), newBundlesFromFailedGen, List.of());
throw t;