Skip to content

Commit b8230eb

Browse files
Akshat-JainAkshat-Jain
authored
Fix race condition in standard ITs: wait for MySQL readiness before starting Druid services (#18800)
1 parent 338a35e commit b8230eb

9 files changed

+89
-42
lines changed

‎integration-tests/docker/docker-compose.base.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ services:
6868
- ./service-supervisords/metadata-storage.conf:/usr/lib/druid/conf/metadata-storage.conf
6969
env_file:
7070
- ./environment-configs/common
71+
healthcheck:
72+
test: ["CMD", "mysqladmin", "ping", "-h", "localhost", "--silent"]
73+
interval: 2s
74+
timeout: 5s
75+
retries: 30
7176

7277

7378
### overlords

‎integration-tests/docker/docker-compose.cds-coordinator-metadata-query-disabled.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ services:
4242
- druid_coordinator_segmentMetadata_disableSegmentMetadataQueries=true
4343
- druid_manager_segments_useIncrementalCache=always
4444
depends_on:
45-
- druid-overlord
46-
- druid-metadata-storage
47-
- druid-zookeeper-kafka
45+
druid-overlord:
46+
condition: service_started
47+
druid-metadata-storage:
48+
condition: service_healthy
49+
druid-zookeeper-kafka:
50+
condition: service_started
4851

4952
druid-overlord:
5053
extends:
@@ -55,8 +58,10 @@ services:
5558
- druid_centralizedDatasourceSchema_enabled=true
5659
- druid_manager_segments_useIncrementalCache=always
5760
depends_on:
58-
- druid-metadata-storage
59-
- druid-zookeeper-kafka
61+
druid-metadata-storage:
62+
condition: service_healthy
63+
druid-zookeeper-kafka:
64+
condition: service_started
6065

6166
druid-historical:
6267
extends:

‎integration-tests/docker/docker-compose.cds-task-schema-publish-disabled.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ services:
4242
- druid_coordinator_segmentMetadata_metadataRefreshPeriod=PT15S
4343
- druid_manager_segments_useIncrementalCache=always
4444
depends_on:
45-
- druid-overlord
46-
- druid-metadata-storage
47-
- druid-zookeeper-kafka
45+
druid-overlord:
46+
condition: service_started
47+
druid-metadata-storage:
48+
condition: service_healthy
49+
druid-zookeeper-kafka:
50+
condition: service_started
4851

4952
druid-overlord:
5053
extends:
@@ -56,8 +59,10 @@ services:
5659
- druid_centralizedDatasourceSchema_taskSchemaPublishDisabled=true
5760
- druid_manager_segments_useIncrementalCache=always
5861
depends_on:
59-
- druid-metadata-storage
60-
- druid-zookeeper-kafka
62+
druid-metadata-storage:
63+
condition: service_healthy
64+
druid-zookeeper-kafka:
65+
condition: service_started
6166

6267
druid-historical:
6368
extends:

‎integration-tests/docker/docker-compose.centralized-datasource-schema.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ services:
4141
- druid_coordinator_segmentMetadata_metadataRefreshPeriod=PT15S
4242
- druid_manager_segments_useIncrementalCache=always
4343
depends_on:
44-
- druid-overlord
45-
- druid-metadata-storage
46-
- druid-zookeeper-kafka
44+
druid-overlord:
45+
condition: service_started
46+
druid-metadata-storage:
47+
condition: service_healthy
48+
druid-zookeeper-kafka:
49+
condition: service_started
4750

4851
druid-overlord:
4952
extends:
@@ -54,8 +57,10 @@ services:
5457
- druid_centralizedDatasourceSchema_enabled=true
5558
- druid_manager_segments_useIncrementalCache=always
5659
depends_on:
57-
- druid-metadata-storage
58-
- druid-zookeeper-kafka
60+
druid-metadata-storage:
61+
condition: service_healthy
62+
druid-zookeeper-kafka:
63+
condition: service_started
5964

6065
druid-historical:
6166
extends:

‎integration-tests/docker/docker-compose.cli-indexer.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ services:
3636
environment:
3737
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
3838
depends_on:
39-
- druid-metadata-storage
40-
- druid-zookeeper-kafka
39+
druid-metadata-storage:
40+
condition: service_healthy
41+
druid-zookeeper-kafka:
42+
condition: service_started
4143

4244
druid-coordinator:
4345
extends:
@@ -46,9 +48,12 @@ services:
4648
environment:
4749
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
4850
depends_on:
49-
- druid-overlord
50-
- druid-metadata-storage
51-
- druid-zookeeper-kafka
51+
druid-overlord:
52+
condition: service_started
53+
druid-metadata-storage:
54+
condition: service_healthy
55+
druid-zookeeper-kafka:
56+
condition: service_started
5257

5358
druid-historical:
5459
extends:

‎integration-tests/docker/docker-compose.ldap-security.yml‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,14 @@ services:
5353
environment:
5454
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
5555
depends_on:
56-
- druid-openldap
57-
- druid-metadata-storage
58-
- druid-zookeeper-kafka
59-
- druid-overlord
56+
druid-openldap:
57+
condition: service_started
58+
druid-metadata-storage:
59+
condition: service_healthy
60+
druid-zookeeper-kafka:
61+
condition: service_started
62+
druid-overlord:
63+
condition: service_started
6064

6165
druid-overlord:
6266
extends:
@@ -68,9 +72,12 @@ services:
6872
environment:
6973
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
7074
depends_on:
71-
- druid-openldap
72-
- druid-metadata-storage
73-
- druid-zookeeper-kafka
75+
druid-openldap:
76+
condition: service_started
77+
druid-metadata-storage:
78+
condition: service_healthy
79+
druid-zookeeper-kafka:
80+
condition: service_started
7481

7582
druid-historical:
7683
extends:

‎integration-tests/docker/docker-compose.query-error-test.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ services:
3636
environment:
3737
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
3838
depends_on:
39-
- druid-metadata-storage
40-
- druid-zookeeper-kafka
39+
druid-metadata-storage:
40+
condition: service_healthy
41+
druid-zookeeper-kafka:
42+
condition: service_started
4143

4244
druid-coordinator:
4345
extends:
@@ -46,9 +48,12 @@ services:
4648
environment:
4749
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
4850
depends_on:
49-
- druid-overlord
50-
- druid-metadata-storage
51-
- druid-zookeeper-kafka
51+
druid-overlord:
52+
condition: service_started
53+
druid-metadata-storage:
54+
condition: service_healthy
55+
druid-zookeeper-kafka:
56+
condition: service_started
5257

5358
druid-broker:
5459
extends:

‎integration-tests/docker/docker-compose.query-retry-test.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ services:
3636
environment:
3737
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
3838
depends_on:
39-
- druid-metadata-storage
40-
- druid-zookeeper-kafka
39+
druid-metadata-storage:
40+
condition: service_healthy
41+
druid-zookeeper-kafka:
42+
condition: service_started
4143

4244
druid-coordinator:
4345
extends:
@@ -46,9 +48,12 @@ services:
4648
environment:
4749
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
4850
depends_on:
49-
- druid-overlord
50-
- druid-metadata-storage
51-
- druid-zookeeper-kafka
51+
druid-overlord:
52+
condition: service_started
53+
druid-metadata-storage:
54+
condition: service_healthy
55+
druid-zookeeper-kafka:
56+
condition: service_started
5257

5358
druid-broker:
5459
extends:

‎integration-tests/docker/docker-compose.yml‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,12 @@ services:
3636
environment:
3737
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
3838
depends_on:
39-
- druid-overlord
40-
- druid-metadata-storage
41-
- druid-zookeeper-kafka
39+
druid-overlord:
40+
condition: service_started
41+
druid-metadata-storage:
42+
condition: service_healthy
43+
druid-zookeeper-kafka:
44+
condition: service_started
4245

4346
druid-overlord:
4447
extends:
@@ -47,8 +50,10 @@ services:
4750
environment:
4851
- DRUID_INTEGRATION_TEST_GROUP=${DRUID_INTEGRATION_TEST_GROUP}
4952
depends_on:
50-
- druid-metadata-storage
51-
- druid-zookeeper-kafka
53+
druid-metadata-storage:
54+
condition: service_healthy
55+
druid-zookeeper-kafka:
56+
condition: service_started
5257

5358
druid-historical:
5459
extends:

0 commit comments

Comments
 (0)