Revert "Revert "Revert "Revert "Catch exception thrown from AbstractComponent.deconstruct.""""

1 files changed, 16 insertions, 2 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 6a2e33db309..1fd08e2be7b 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
@@ -7,11 +7,14 @@ import com.yahoo.container.di.ComponentDeconstructor;
 import com.yahoo.container.di.componentgraph.Provider;
 import com.yahoo.jdisc.SharedResource;
 
+import java.util.Random;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
+import static java.util.logging.Level.WARNING;
+
 /**
 * @author tonyv
 * @author gv
@@ -54,8 +57,19 @@ public class Deconstructor implements ComponentDeconstructor {
 
         public void run() {
             log.info("Starting deconstruction of " + component);
-            component.deconstruct();
-            log.info("Finished deconstructing " + component);
+            try {
+                component.deconstruct();
+                log.info("Finished deconstructing " + component);
+            } catch (Error e) {
+                try {
+                    Thread.sleep((long) (new Random(System.nanoTime()).nextDouble() * 180 * 1000));
+                } catch (InterruptedException e) { }
+                com.yahoo.protect.Process.logAndDie("Error when deconstructing " + component, e);
+            } catch (Exception e) {
+                log.log(WARNING, "Exception thrown when deconstructing " + component, e);
+            } catch (Throwable t) {
+                log.log(WARNING, "Unexpected Throwable thrown when deconstructing " + component, t);
+            }
         }
     }
 }