Deconstruct partial graph if construction fail

1 files changed, 9 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 d7c94af2a97..526b201c886 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
@@ -76,7 +76,15 @@ public class Container {
             Collection<Bundle> obsoleteBundles = new HashSet<>();
             ComponentGraph newGraph = waitForNewConfigGenAndCreateGraph(oldGraph, fallbackInjector, isInitializing, obsoleteBundles);
             newGraph.reuseNodes(oldGraph);
-            constructComponents(newGraph);
+            try {
+                constructComponents(newGraph);
+            } catch (Exception e) {
+                log.log(Level.WARNING, String.format(
+                        "Failed to construct graph for generation '%d' - scheduling partial graph for deconstruction",
+                        newGraph.generation()), e);
+                deconstructAllComponents(newGraph, componentDeconstructor);
+                throw e;
+            }
             Runnable cleanupTask = createPreviousGraphDeconstructionTask(oldGraph, newGraph, obsoleteBundles);
             return new ComponentGraphResult(newGraph, cleanupTask);
         } catch (Throwable t) {