[Bug]: duct-tape:1.0.8 contains a Thread Leak

2nd step: call shutdown() when stopping the container Related to testcontainers#9227.
dadoonet · Sep 16, 2024 · 040bfa7 · 040bfa7
1 parent 259ad3a
commit 040bfa7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/core/src/main/java/org/testcontainers/containers/GenericContainer.java b/core/src/main/java/org/testcontainers/containers/GenericContainer.java
@@ -65,6 +65,7 @@
 import org.testcontainers.utility.TestcontainersConfiguration;
 import org.testcontainers.utility.ducttape.RateLimiter;
 import org.testcontainers.utility.ducttape.RateLimiterBuilder;
+import org.testcontainers.utility.ducttape.Timeouts;
 import org.testcontainers.utility.ducttape.Unreliables;
 
 import java.io.File;
@@ -660,6 +661,9 @@ public void stop() {
             containerId = null;
             containerInfo = null;
         }
+
+        // If the Timeouts class was used, it created a Thread we need to close
+        Timeouts.shutdown();
     }
 
     /**

diff --git a/core/src/main/java/org/testcontainers/utility/ducttape/Timeouts.java b/core/src/main/java/org/testcontainers/utility/ducttape/Timeouts.java
@@ -21,6 +21,10 @@ public Thread newThread(Runnable r) {
         }
     });
 
+    public static void shutdown() {
+        EXECUTOR_SERVICE.shutdown();
+    }
+
     /**
      * Execute a lambda expression with a timeout. If it completes within the time, the result will be returned.
      * If it does not complete within the time, a TimeoutException will be thrown.