You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by du...@apache.org on 2024/08/21 05:52:57 UTC

(shardingsphere) branch master updated: Add MySQLContainer startup timeout. (#32608)

This is an automated email from the ASF dual-hosted git repository.

duanzhengqiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new dd520cb5f39 Add MySQLContainer startup timeout. (#32608)
dd520cb5f39 is described below

commit dd520cb5f39184dd7d6520d94e2f74295d9b2d2a
Author: Cong Hu <ia...@gmail.com>
AuthorDate: Wed Aug 21 13:52:50 2024 +0800

    Add MySQLContainer startup timeout. (#32608)
---
 test/e2e/env/pom.xml                                                   | 1 -
 .../test/e2e/env/container/atomic/storage/impl/MySQLContainer.java     | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/e2e/env/pom.xml b/test/e2e/env/pom.xml
index 1c5ca58d159..9363a8a22d7 100644
--- a/test/e2e/env/pom.xml
+++ b/test/e2e/env/pom.xml
@@ -48,7 +48,6 @@
             <groupId>com.alibaba</groupId>
             <artifactId>dns-cache-manipulator</artifactId>
             <version>1.8.2</version>
-            <scope>test-jar</scope>
         </dependency>
     </dependencies>
     
diff --git a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
index 55613568514..e1dbf89e3f8 100644
--- a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
+++ b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/impl/MySQLContainer.java
@@ -24,6 +24,8 @@ import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
 import org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
 
+import java.time.Duration;
+import java.time.temporal.ChronoUnit;
 import java.util.Collection;
 import java.util.Map.Entry;
 import java.util.Optional;
@@ -50,6 +52,7 @@ public final class MySQLContainer extends DockerStorageContainer {
         setCommands(storageContainerConfig.getContainerCommand());
         addEnvs(storageContainerConfig.getContainerEnvironments());
         mapResources(storageContainerConfig.getMountedResources());
+        withStartupTimeout(Duration.of(120L, ChronoUnit.SECONDS));
         super.configure();
     }