Cache Ryuk's failure to prevent the double start (#2935)

see #2395

Author: bsideup

core/src/main/java/org/testcontainers/DockerClientFactory.java

@@ -66,7 +66,7 @@ public class DockerClientFactory {
     DockerClient dockerClient;
 
     @VisibleForTesting
-    RuntimeException cachedChecksFailure;
+    RuntimeException cachedClientFailure;
 
     private String activeApiVersion;
     private String activeExecutionDriver;
@@ -139,9 +139,9 @@ public DockerClient client() {
         }
 
         // fail-fast if checks have failed previously
-        if (cachedChecksFailure != null) {
-            log.debug("There is a cached checks failure - throwing", cachedChecksFailure);
-            throw cachedChecksFailure;
+        if (cachedClientFailure != null) {
+            log.debug("There is a cached checks failure - throwing", cachedClientFailure);
+            throw cachedClientFailure;
         }
 
         final DockerClientProviderStrategy strategy = getOrInitializeStrategy();
@@ -170,7 +170,12 @@ public void close() {
         boolean useRyuk = !Boolean.parseBoolean(System.getenv("TESTCONTAINERS_RYUK_DISABLED"));
         if (useRyuk) {
             log.debug("Ryuk is enabled");
-            ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+            try {
+                ryukContainerId = ResourceReaper.start(hostIpAddress, client);
+            } catch (RuntimeException e) {
+                cachedClientFailure = e;
+                throw e;
+            }
             log.info("Ryuk started - will monitor and terminate Testcontainers containers on JVM exit");
         } else {
             log.debug("Ryuk is disabled");
@@ -201,7 +206,7 @@ public void close() {
                     );
                 }
             } catch (RuntimeException e) {
-                cachedChecksFailure = e;
+                cachedClientFailure = e;
                 throw e;
             }
         } else {

core/src/test/java/org/testcontainers/DockerClientFactoryTest.java

@@ -71,7 +71,7 @@ public void failedChecksFailFast() {
 
         DockerClientFactory instance = new DockerClientFactory();
         DockerClient dockerClient = instance.dockerClient;
-        assertThat(instance.cachedChecksFailure).isNull();
+        assertThat(instance.cachedClientFailure).isNull();
         try {
             // Remove cached client to force the initialization logic
             instance.dockerClient = null;
@@ -80,12 +80,12 @@ public void failedChecksFailFast() {
             assertThatThrownBy(instance::client).isInstanceOf(DockerException.class);
 
             RuntimeException failure = new IllegalStateException("Boom!");
-            instance.cachedChecksFailure = failure;
+            instance.cachedClientFailure = failure;
             // Fail fast
             assertThatThrownBy(instance::client).isEqualTo(failure);
         } finally {
             instance.dockerClient = dockerClient;
-            instance.cachedChecksFailure = null;
+            instance.cachedClientFailure = null;
         }
     }
 }