Respect topological ordering when releasing shared resources

2 files changed, 12 insertions, 4 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 acf4a494a96..747c2865ea1 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
@@ -76,9 +76,8 @@ public class Deconstructor implements ComponentDeconstructor {
             } else if (component instanceof Provider) {
                 destructibleComponents.add((Deconstructable) component);
             } else if (component instanceof SharedResource) {
-                log.log(FINE, () -> "Releasing container reference to resource " + component);
-                // No need to delay release, as jdisc does ref-counting
-                ((SharedResource) component).release();
+                // Release shared resources in same order as other components in case of usage without reference counting
+                destructibleComponents.add(new SharedResourceReleaser(component));
             }
         }
         if (!destructibleComponents.isEmpty() || !bundles.isEmpty()) {
@@ -104,6 +103,14 @@ public class Deconstructor implements ComponentDeconstructor {
         }
     }
 
+    private static class SharedResourceReleaser implements Deconstructable {
+        final SharedResource resource;
+
+        private SharedResourceReleaser(Object resource) { this.resource = (SharedResource) resource; }
+
+        @Override public void deconstruct() { resource.release(); }
+    }
+
     private static class DestructComponentTask implements Runnable {
 
         private final Random random = new Random(System.nanoTime());
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 e9a9d310380..0a7d3f45e82 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
@@ -57,9 +57,10 @@ public class DeconstructorTest {
     }
 
     @Test
-    public void require_shared_resource_released() {
+    public void require_shared_resource_released() throws InterruptedException {
         TestSharedResource sharedResource = new TestSharedResource();
         deconstructor.deconstruct(List.of(sharedResource), emptyList());
+        waitForDeconstructToComplete(() -> sharedResource.released);
         assertTrue(sharedResource.released);
     }