Do not check attached containers health

Health of these containers is checked by the origin process that controls them.
trinodb · Oct 6, 2020 · ce97ec8 · ce97ec8
1 parent 62c87d2
commit ce97ec8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/...product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/cli/TestRun.java b/...product-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/cli/TestRun.java
@@ -51,12 +51,10 @@
 import static io.prestosql.tests.product.launcher.cli.Commands.runCommand;
 import static io.prestosql.tests.product.launcher.docker.ContainerUtil.exposePort;
 import static io.prestosql.tests.product.launcher.env.DockerContainer.cleanOrCreateHostPath;
-import static io.prestosql.tests.product.launcher.env.Environment.allContainersHealthy;
 import static io.prestosql.tests.product.launcher.env.EnvironmentContainers.TESTS;
 import static io.prestosql.tests.product.launcher.env.EnvironmentListener.getStandardListeners;
 import static io.prestosql.tests.product.launcher.env.common.Standard.CONTAINER_TEMPTO_PROFILE_CONFIG;
 import static java.lang.StrictMath.toIntExact;
-import static java.lang.String.format;
 import static java.time.Duration.ofMinutes;
 import static java.util.Objects.requireNonNull;
 import static org.testcontainers.containers.BindMode.READ_ONLY;
@@ -212,22 +210,17 @@ private Environment startEnvironment()
             Collection<DockerContainer> allContainers = environment.getContainers();
             DockerContainer testsContainer = environment.getContainer(TESTS);
 
-            Collection<DockerContainer> environmentContainers = allContainers.stream()
-                    .filter(container -> !container.equals(testsContainer))
-                    .collect(toImmutableList());
-
             if (!attach) {
                 // Reestablish dependency on every startEnvironment attempt
+                Collection<DockerContainer> environmentContainers = allContainers.stream()
+                        .filter(container -> !container.equals(testsContainer))
+                        .collect(toImmutableList());
                 testsContainer.dependsOn(environmentContainers);
 
                 log.info("Starting the environment '%s' with configuration %s", this.environment, environmentConfig);
                 environment.start();
             }
             else {
-                if (!allContainersHealthy(environmentContainers)) {
-                    throw new RuntimeException(format("Could not attach tests to unhealthy environment %s", this.environment));
-                }
-
                 testsContainer.setNetwork(new ExistingNetwork(Environment.PRODUCT_TEST_LAUNCHER_NETWORK));
                 // TODO prune previous ptl-tests container
                 testsContainer.start();

diff --git a/...uct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/Environment.java b/...uct-tests-launcher/src/main/java/io/prestosql/tests/product/launcher/env/Environment.java
@@ -217,7 +217,7 @@ public long awaitTestsCompletion()
             while (testContainer.isRunning()) {
                 Thread.sleep(10000); // check every 10 seconds
 
-                if (!allContainersHealthy(containers)) {
+                if (!attached && !allContainersHealthy(containers)) {
                     log.warn("Environment %s is not healthy, interrupting tests", name);
                     return ENVIRONMENT_FAILED_EXIT_CODE;
                 }
@@ -277,7 +277,7 @@ public void close()
         }
     }
 
-    public static boolean allContainersHealthy(Iterable<DockerContainer> containers)
+    private static boolean allContainersHealthy(Iterable<DockerContainer> containers)
     {
         return Streams.stream(containers)
                 .allMatch(Environment::containerIsHealthy);