From 8fcb669a97e90c3f4e76194b130e9931fb3b0c90 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Sat, 28 Jun 2025 20:56:08 -0700 Subject: [PATCH 1/4] ATLAS-5058: Update ci.yml to rely on healthchecks Since health checks for respective containers are in place, `ci.yml` can be updated to rely on this. --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 009cd5b199e..d7f951ff40c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -110,11 +110,10 @@ jobs: -f docker-compose.atlas-hadoop.yml \ -f docker-compose.atlas-hbase.yml \ -f docker-compose.atlas-kafka.yml \ - -f docker-compose.atlas-hive.yml up -d + -f docker-compose.atlas-hive.yml up -d --wait - name: Check status of containers and remove them run: | - sleep 60 containers=(atlas atlas-hadoop atlas-hbase atlas-kafka atlas-hive); flag=true; for container in "${containers[@]}"; do From 4795c84925b5e6bb9d51b847c309758e6585baf7 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 8 Jul 2025 13:41:23 -0700 Subject: [PATCH 2/4] do not run but build atlas-base --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7f951ff40c..136d1a54d72 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -104,8 +104,8 @@ jobs: cd dev-support/atlas-docker export DOCKER_BUILDKIT=1 export COMPOSE_DOCKER_CLI_BUILD=1 + docker compose -f docker-compose.atlas-base.yml build docker compose \ - -f docker-compose.atlas-base.yml \ -f docker-compose.atlas.yml \ -f docker-compose.atlas-hadoop.yml \ -f docker-compose.atlas-hbase.yml \ From a4fb7d26a133156dcbfdeb1c52bd5f2e5315794a Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 8 Jul 2025 14:37:34 -0700 Subject: [PATCH 3/4] atlas-hadoop: remove dependency on atlas-base --- dev-support/atlas-docker/docker-compose.atlas-hadoop.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml b/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml index 16c1949ba6d..a6880fc222b 100644 --- a/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml +++ b/dev-support/atlas-docker/docker-compose.atlas-hadoop.yml @@ -15,8 +15,6 @@ services: ports: - "9000:9000" - "8088:8088" - depends_on: - - atlas-base healthcheck: test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ] interval: 30s From 84e42b83ee533d5b5a970d672bffbea70431dea4 Mon Sep 17 00:00:00 2001 From: Abhishek Kumar Date: Tue, 8 Jul 2025 16:00:26 -0700 Subject: [PATCH 4/4] Add health check for atlas-db --- .../atlas-docker/docker-compose.atlas-hive.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dev-support/atlas-docker/docker-compose.atlas-hive.yml b/dev-support/atlas-docker/docker-compose.atlas-hive.yml index 3acb431a1e8..9934a9d12de 100644 --- a/dev-support/atlas-docker/docker-compose.atlas-hive.yml +++ b/dev-support/atlas-docker/docker-compose.atlas-hive.yml @@ -14,6 +14,12 @@ services: tty: true networks: - atlas + healthcheck: + test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ] + interval: 30s + timeout: 10s + retries: 30 + start_period: 40s ports: - "10000:10000" depends_on: @@ -40,11 +46,10 @@ services: networks: - atlas healthcheck: - test: [ "CMD-SHELL", "su hdfs -c \"/opt/hadoop/bin/hdfs dfsadmin -report | grep -q 'Live datanodes'\"" ] - interval: 30s - timeout: 10s + test: 'su -c "pg_isready -q" postgres' + interval: 10s + timeout: 2s retries: 30 - start_period: 40s networks: atlas: