Wait for component deconstruction to finish when shutting down.

- Wait up to 10 minuts.
- Add separate modes for reconfig and shutdown.
- Add test ctor for setting the delay before deconstruction starts
  in RECONFIG mode. (Tests are TBD.)

1 files changed, 23 insertions, 1 deletions

diff --git a/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java b/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java
index 9ae05f5c193..dfc1d32938f 100644
--- a/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java
+++ b/container-disc/src/test/java/com/yahoo/container/jdisc/component/DeconstructorTest.java
@@ -24,12 +24,13 @@ public class DeconstructorTest {
 
     @Before
     public void init() {
-        deconstructor = new Deconstructor(false);
+        deconstructor = new Deconstructor(Deconstructor.Mode.SHUTDOWN);
     }
 
     @Test
     public void require_abstract_component_destructed() throws InterruptedException {
         TestAbstractComponent abstractComponent = new TestAbstractComponent();
+
         // Done by executor, so it takes some time even with a 0 delay.
         deconstructor.deconstruct(List.of(abstractComponent), emptyList());
         deconstructor.executor.shutdown();
@@ -47,6 +48,13 @@ public class DeconstructorTest {
     }
 
     @Test
+    public void deconstruct_is_synchronous_in_shutdown_mode() {
+        var slowDeconstructComponent = new SlowDeconstructComponent();
+        deconstructor.deconstruct(List.of(slowDeconstructComponent), emptyList());
+        assertTrue(slowDeconstructComponent.destructed);
+    }
+
+    @Test
     public void require_shared_resource_released() {
         TestSharedResource sharedResource = new TestSharedResource();
         deconstructor.deconstruct(List.of(sharedResource), emptyList());
@@ -68,6 +76,20 @@ public class DeconstructorTest {
         @Override public void deconstruct() { destructed = true; }
     }
 
+    private static class SlowDeconstructComponent extends AbstractComponent {
+        boolean destructed = false;
+        @Override
+        public void deconstruct() {
+            // Add delay to verify that the Deconstructor waits until this is complete before returning.
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                throw new RuntimeException("The delayed deconstruct was interrupted.");
+            }
+            destructed = true;
+        }
+    }
+
     private static class TestProvider implements Provider<Void> {
         volatile boolean destructed = false;