This is an automated email from the ASF dual-hosted git repository.
capistrant pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new fd5698a5941 Wait for minio to be healthy before creating buckets in s3
integration-tests-ex (#18125)
fd5698a5941 is described below
commit fd5698a5941072b056321aca8dd4436a78abbad6
Author: Lucas Capistrant <[email protected]>
AuthorDate: Fri Jun 13 12:10:03 2025 -0500
Wait for minio to be healthy before creating buckets in s3
integration-tests-ex (#18125)
* Wait for minio to be healthy before creating buckets in s3
integration-tests-ex
* tighten up startup parameters in docker-compose for minio
---
integration-tests-ex/cases/cluster/Common/dependencies.yaml | 7 +++++++
integration-tests-ex/cases/cluster/S3DeepStorage/docker-compose.py | 6 +++---
integration-tests-ex/cases/cluster/template.py | 4 +++-
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/integration-tests-ex/cases/cluster/Common/dependencies.yaml
b/integration-tests-ex/cases/cluster/Common/dependencies.yaml
index 745da3b407c..b63b6dd82e2 100644
--- a/integration-tests-ex/cases/cluster/Common/dependencies.yaml
+++ b/integration-tests-ex/cases/cluster/Common/dependencies.yaml
@@ -116,6 +116,13 @@ services:
environment:
- MINIO_ROOT_USER=${AWS_ACCESS_KEY_ID}
- MINIO_ROOT_PASSWORD=${AWS_SECRET_ACCESS_KEY}
+ healthcheck:
+ test: [ "CMD", "curl", "-f", "http://localhost:9000/minio/health/ready"; ]
+ interval: 5s
+ timeout: 3s
+ retries: 12
+ start_period: 1m
+ start_interval: 5s
create_minio_buckets:
image: minio/mc
diff --git a/integration-tests-ex/cases/cluster/S3DeepStorage/docker-compose.py
b/integration-tests-ex/cases/cluster/S3DeepStorage/docker-compose.py
index 005ff8d143f..d0d39b433bc 100644
--- a/integration-tests-ex/cases/cluster/S3DeepStorage/docker-compose.py
+++ b/integration-tests-ex/cases/cluster/S3DeepStorage/docker-compose.py
@@ -14,7 +14,7 @@
# limitations under the License.
from template import BaseTemplate, generate
-from template import ZOO_KEEPER, METADATA, OVERLORD
+from template import ZOO_KEEPER, METADATA, OVERLORD, MINIO
class Template(BaseTemplate):
@@ -56,11 +56,11 @@ class Template(BaseTemplate):
self.add_volume(service, '../data', '/resources')
def create_minio_container(self):
- return self.define_external_service("minio")
+ return self.define_external_service(MINIO)
def create_minio_bucket(self):
service = self.define_external_service("create_minio_buckets")
- self.add_depends(service, ['minio'])
+ self.add_depends(service, [MINIO])
return service
# No kafka dependency in this cluster
diff --git a/integration-tests-ex/cases/cluster/template.py
b/integration-tests-ex/cases/cluster/template.py
index 374f902dbf5..3645d204575 100644
--- a/integration-tests-ex/cases/cluster/template.py
+++ b/integration-tests-ex/cases/cluster/template.py
@@ -32,6 +32,7 @@ DRUID_NETWORK = 'druid-it-net'
DRUID_SUBNET = '172.172.172'
ZOO_KEEPER = 'zookeeper'
METADATA = 'metadata'
+MINIO = 'minio'
KAFKA = 'kafka'
COORDINATOR = 'coordinator'
OVERLORD = 'overlord'
@@ -72,7 +73,8 @@ class BaseTemplate:
# Lookup map to determine what depends_on condition needs to be specified
for a docker-compose dependency.
SERVICE_DEPENDENCY_CONDITION_LOOKUP = {
METADATA: 'service_healthy',
- ZOO_KEEPER: 'service_started'
+ ZOO_KEEPER: 'service_started',
+ MINIO: 'service_healthy',
}
def __init__(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
