From a0f3d21835d23fd28dcbf4e6c0737ff2f4a82165 Mon Sep 17 00:00:00 2001 From: Jef Vantongerloo Date: Thu, 13 Feb 2025 20:27:37 +0100 Subject: [PATCH 1/3] fix-task-manager-db-healthcheck Signed-off-by: Jef Vantongerloo --- changelog/5739.fixed.md | 1 + development/docker-compose-deps-nats.yml | 2 +- development/docker-compose-deps.yml | 2 +- docker-compose.yml | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) create mode 100644 changelog/5739.fixed.md diff --git a/changelog/5739.fixed.md b/changelog/5739.fixed.md new file mode 100644 index 0000000000..d333cf4f8c --- /dev/null +++ b/changelog/5739.fixed.md @@ -0,0 +1 @@ +Fix Docker task-manager-db Postgress healthcheck test by adding database and user parameters. \ No newline at end of file diff --git a/development/docker-compose-deps-nats.yml b/development/docker-compose-deps-nats.yml index 988d524124..0c863f2803 100644 --- a/development/docker-compose-deps-nats.yml +++ b/development/docker-compose-deps-nats.yml @@ -49,7 +49,7 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready"] + test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] interval: 10s timeout: 5s retries: 5 diff --git a/development/docker-compose-deps.yml b/development/docker-compose-deps.yml index f9f893b382..ae05c7b628 100644 --- a/development/docker-compose-deps.yml +++ b/development/docker-compose-deps.yml @@ -47,7 +47,7 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready"] + test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose.yml b/docker-compose.yml index 6fc7253d8d..1d5252b4f2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -199,7 +199,7 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready"] + test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] interval: 10s timeout: 5s retries: 5 From b1b2598bf051d3df07fae81206bb82229c1ca75d Mon Sep 17 00:00:00 2001 From: Jef Vantongerloo Date: Fri, 14 Feb 2025 08:51:56 +0100 Subject: [PATCH 2/3] fix yamllint line-length error Signed-off-by: Jef Vantongerloo --- development/docker-compose-deps-nats.yml | 4 +++- development/docker-compose-deps.yml | 4 +++- docker-compose.yml | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/development/docker-compose-deps-nats.yml b/development/docker-compose-deps-nats.yml index 0c863f2803..94884b27d2 100644 --- a/development/docker-compose-deps-nats.yml +++ b/development/docker-compose-deps-nats.yml @@ -49,7 +49,9 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] + test: + - "CMD-SHELL" + - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}" interval: 10s timeout: 5s retries: 5 diff --git a/development/docker-compose-deps.yml b/development/docker-compose-deps.yml index ae05c7b628..2114429812 100644 --- a/development/docker-compose-deps.yml +++ b/development/docker-compose-deps.yml @@ -47,7 +47,9 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] + test: + - "CMD-SHELL" + - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}" interval: 10s timeout: 5s retries: 5 diff --git a/docker-compose.yml b/docker-compose.yml index 1d5252b4f2..fc706e9c69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -199,7 +199,9 @@ services: volumes: - workflow_db:/var/lib/postgresql/data healthcheck: - test: ["CMD-SHELL", "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}"] + test: + - "CMD-SHELL" + - "pg_isready -q -d ${INFRAHUB_TASKMANAGER_DB_DATABASE:-prefect} -U ${INFRAHUB_TASKMANAGER_DB_USER:-postgres}" interval: 10s timeout: 5s retries: 5 From 3945331f0659f7c5b91d3e71fba09baa3c8185cc Mon Sep 17 00:00:00 2001 From: Jef Vantongerloo Date: Fri, 14 Feb 2025 09:29:58 +0100 Subject: [PATCH 3/3] Add healthcheck & Postgress (#5753) Signed-off-by: Jef Vantongerloo --- .vale/styles/spelling-exceptions.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vale/styles/spelling-exceptions.txt b/.vale/styles/spelling-exceptions.txt index 04c9641965..7936ab939f 100644 --- a/.vale/styles/spelling-exceptions.txt +++ b/.vale/styles/spelling-exceptions.txt @@ -51,6 +51,7 @@ graphene graphiql graphql greymatter +healthcheck hfid hfids hostname @@ -95,6 +96,7 @@ order_weight openconfig opentelemetry order_by +Postgress Prefetch profile_name pseudocode