Make Testcontainers parent first again

To avoid long lived threads being attached to child class loaders. It was done at some point but was reverted because of the ducttape dependency not being parent first. I think it's worth another try by including this dependency.
gsmet · Aug 14, 2024 · ae4a8de · ae4a8de
1 parent be411d9
commit ae4a8de
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 2 deletions.
diff --git a/core/deployment/pom.xml b/core/deployment/pom.xml
@@ -18,6 +18,14 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-classloader-commons</artifactId>
         </dependency>
+        <!-- Uncomment this dependency to have Testcontainers loaded parent first -->
+        <!-- Make sure you build with -Denforcer.skip after that -->
+<!--
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>testcontainers</artifactId>
+        </dependency>
+-->
         <dependency>
             <groupId>org.aesh</groupId>
             <artifactId>readline</artifactId>

diff --git a/core/runtime/pom.xml b/core/runtime/pom.xml
@@ -217,6 +217,15 @@
 
                         <!-- Make use of byteman frictionless -->
                         <parentFirstArtifact>org.jboss.byteman:byteman</parentFirstArtifact>
+
+                        <!--
+                          Testcontainers support: Testcontainers start a lot of threads that are long lived,
+                          leaking class loaders like crazy.
+                        -->
+                        <parentFirstArtifact>org.testcontainers:testcontainers</parentFirstArtifact>
+                        <parentFirstArtifact>com.github.docker-java:docker-java-api</parentFirstArtifact>
+                        <parentFirstArtifact>com.github.docker-java:docker-java-transport-zerodep</parentFirstArtifact>
+                        <parentFirstArtifact>org.rnorth.duct-tape:duct-tape</parentFirstArtifact>
                     </parentFirstArtifacts>
                     <runnerParentFirstArtifacts>
                         <runnerParentFirstArtifact>org.graalvm.sdk:nativeimage</runnerParentFirstArtifact>
@@ -257,6 +266,15 @@
                         <runnerParentFirstArtifact>io.github.crac:org-crac</runnerParentFirstArtifact>
                         <!-- Make use of byteman frictionless -->
                         <runnerParentFirstArtifact>org.jboss.byteman:byteman</runnerParentFirstArtifact>
+
+                        <!--
+                          Testcontainers support: Testcontainers start a lot of threads that are long lived,
+                          leaking class loaders like crazy.
+                        -->
+                        <runnerParentFirstArtifact>org.testcontainers:testcontainers</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>com.github.docker-java:docker-java-api</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>com.github.docker-java:docker-java-transport-zerodep</runnerParentFirstArtifact>
+                        <runnerParentFirstArtifact>org.rnorth.duct-tape:duct-tape</runnerParentFirstArtifact>
                     </runnerParentFirstArtifacts>
                     <excludedArtifacts>
                         <excludedArtifact>io.smallrye:smallrye-config</excludedArtifact>

diff --git a/...ain/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java b/...ain/java/io/quarkus/devservices/postgresql/deployment/PostgresqlDevServicesProcessor.java
@@ -16,6 +16,7 @@
 import org.testcontainers.containers.wait.strategy.WaitAllStrategy;
 import org.testcontainers.utility.DockerImageName;
 
+import io.quarkus.bootstrap.classloading.QuarkusClassLoader;
 import io.quarkus.datasource.common.runtime.DataSourceUtil;
 import io.quarkus.datasource.common.runtime.DatabaseKind;
 import io.quarkus.datasource.deployment.spi.DevServicesDatasourceContainerConfig;
@@ -77,7 +78,14 @@ public RunningDevServicesDatasource startDatabase(Optional<String> username, Opt
                 containerConfig.getCommand().ifPresent(container::setCommand);
                 containerConfig.getInitScriptPath().ifPresent(container::withInitScript);
 
-                container.start();
+                ClassLoader originalClassLoader = Thread.currentThread().getContextClassLoader();
+                try {
+                    Thread.currentThread()
+                            .setContextClassLoader(((QuarkusClassLoader) originalClassLoader).getPlatformClassLoader());
+                    container.start();
+                } finally {
+                    Thread.currentThread().setContextClassLoader(originalClassLoader);
+                }
 
                 LOG.info("Dev Services for PostgreSQL started.");
 

diff --git a/...ts/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java b/...ts/bootstrap/core/src/main/java/io/quarkus/bootstrap/classloading/QuarkusClassLoader.java
@@ -517,7 +517,7 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
                     try {
                         return parent.loadClass(name);
                     } catch (ClassNotFoundException ignore) {
-                        log.tracef("Class %s not found in parent first load from %s", name, parent);
+                        log.warnf("Class %s not found in parent first load from %s", name, parent);
                     }
                 }
                 ClassPathElement classPathElement = classPathResourceIndex.getFirstClassPathElement(resourceName);