chore(sqllogictests): Check container and stop first to avoid conflict running (#17261)

* chore(sqllogictests): Stop container to avoid conflict running

* add sleep

* check timeout

Author: b41sh

tests/sqllogictests/src/util.rs

@@ -19,18 +19,21 @@ use std::path::PathBuf;
 use std::time::Duration;
 use std::time::Instant;
 
+use bollard::container::RemoveContainerOptions;
 use bollard::Docker;
 use clap::Parser;
 use redis::Commands;
 use serde::Deserialize;
 use serde::Serialize;
 use serde_json::Value;
+use testcontainers::core::error::WaitContainerError;
 use testcontainers::core::IntoContainerPort;
 use testcontainers::core::WaitFor;
 use testcontainers::runners::AsyncRunner;
 use testcontainers::ContainerAsync;
 use testcontainers::GenericImage;
 use testcontainers::ImageExt;
+use testcontainers::TestcontainersError;
 use testcontainers_modules::mysql::Mysql;
 use testcontainers_modules::redis::Redis;
 use testcontainers_modules::redis::REDIS_PORT;
@@ -256,9 +259,7 @@ pub async fn run_ttc_container(
     let start = Instant::now();
     println!("Start container {container_name}");
 
-    // Stop the container
-    let _ = docker.stop_container(&container_name, None).await;
-    let _ = docker.remove_container(&container_name, None).await;
+    stop_container(docker, &container_name).await;
 
     let mut i = 1;
     loop {
@@ -290,6 +291,10 @@ pub async fn run_ttc_container(
                     "Start container {} using {} secs failed: {}",
                     container_name, duration, err
                 );
+                if let TestcontainersError::WaitContainer(WaitContainerError::StartupTimeout) = err
+                {
+                    stop_container(docker, &container_name).await;
+                }
                 if i == CONTAINER_RETRY_TIMES || duration >= CONTAINER_TIMEOUT_SECONDS {
                     break;
                 } else {
@@ -327,9 +332,7 @@ async fn run_redis_server(docker: &Docker) -> Result<ContainerAsync<Redis>> {
     let container_name = "redis".to_string();
     println!("Start container {container_name}");
 
-    // Stop the container
-    let _ = docker.stop_container(&container_name, None).await;
-    let _ = docker.remove_container(&container_name, None).await;
+    stop_container(docker, &container_name).await;
 
     let mut i = 1;
     loop {
@@ -365,6 +368,10 @@ async fn run_redis_server(docker: &Docker) -> Result<ContainerAsync<Redis>> {
                     "Start container {} using {} secs failed: {}",
                     container_name, duration, err
                 );
+                if let TestcontainersError::WaitContainer(WaitContainerError::StartupTimeout) = err
+                {
+                    stop_container(docker, &container_name).await;
+                }
                 if i == CONTAINER_RETRY_TIMES || duration >= CONTAINER_TIMEOUT_SECONDS {
                     break;
                 } else {
@@ -381,9 +388,7 @@ async fn run_mysql_server(docker: &Docker) -> Result<ContainerAsync<Mysql>> {
     let container_name = "mysql".to_string();
     println!("Start container {container_name}");
 
-    // Stop the container
-    let _ = docker.stop_container(&container_name, None).await;
-    let _ = docker.remove_container(&container_name, None).await;
+    stop_container(docker, &container_name).await;
 
     // Add a table for test.
     // CREATE TABLE test.user(
@@ -436,6 +441,10 @@ async fn run_mysql_server(docker: &Docker) -> Result<ContainerAsync<Mysql>> {
                     "Start container {} using {} secs failed: {}",
                     container_name, duration, err
                 );
+                if let TestcontainersError::WaitContainer(WaitContainerError::StartupTimeout) = err
+                {
+                    stop_container(docker, &container_name).await;
+                }
                 if i == CONTAINER_RETRY_TIMES || duration >= CONTAINER_TIMEOUT_SECONDS {
                     break;
                 } else {
@@ -446,3 +455,14 @@ async fn run_mysql_server(docker: &Docker) -> Result<ContainerAsync<Mysql>> {
     }
     Err(format!("Start {container_name} failed").into())
 }
+
+// Stop the running container to avoid conflict
+async fn stop_container(docker: &Docker, container_name: &str) {
+    let _ = docker.stop_container(container_name, None).await;
+    let options = Some(RemoveContainerOptions {
+        force: true,
+        ..Default::default()
+    });
+    let _ = docker.remove_container(container_name, options).await;
+    println!("Stop container {container_name}");
+}