From 0ec8e4e01847c623aa0584277c32b9e67e73b1be Mon Sep 17 00:00:00 2001 From: yerkennz Date: Tue, 7 Apr 2026 12:42:45 +0500 Subject: [PATCH 1/2] fix: rollback exitcode --- services/upgrade/docker/start.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/upgrade/docker/start.sh b/services/upgrade/docker/start.sh index 5929e305..f6cb63b6 100755 --- a/services/upgrade/docker/start.sh +++ b/services/upgrade/docker/start.sh @@ -100,6 +100,7 @@ function handle_master_upgrade() { ls -la $MIGRATION_PATH + set +e echo "[$(date +%Y-%m-%dT%H:%M:%S)] Check cluster before upgrade" /usr/lib/postgresql/"${PG_VERSION_TARGET}"/bin/pg_upgrade \ --old-datadir "/var/lib/pgsql/data/${DATA_DIR}" \ @@ -110,6 +111,7 @@ function handle_master_upgrade() { > /var/lib/pgsql/data/check_result CHECK_CODE=$? + set -e if [[ "$CHECK_CODE" -ne 0 ]]; then echo "[$(date +%Y-%m-%dT%H:%M:%S)] Check cluster before upgrade - Failed." @@ -244,8 +246,8 @@ check_pgsql_version if [[ "${TYPE}" == "master" ]]; then handle_master_upgrade + exit $? elif [[ "${TYPE}" == "replica" ]]; then handle_replica_upgrade + exit $? fi - -exit 0 From 9a4e594c0d617590fadfeab2c0c77e3a9fe44553 Mon Sep 17 00:00:00 2001 From: yerkennz Date: Mon, 13 Apr 2026 13:37:28 +0500 Subject: [PATCH 2/2] fix[CPCAP-3400]: reset -e globally --- services/upgrade/docker/start.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/services/upgrade/docker/start.sh b/services/upgrade/docker/start.sh index f6cb63b6..7ee00ed9 100755 --- a/services/upgrade/docker/start.sh +++ b/services/upgrade/docker/start.sh @@ -100,7 +100,6 @@ function handle_master_upgrade() { ls -la $MIGRATION_PATH - set +e echo "[$(date +%Y-%m-%dT%H:%M:%S)] Check cluster before upgrade" /usr/lib/postgresql/"${PG_VERSION_TARGET}"/bin/pg_upgrade \ --old-datadir "/var/lib/pgsql/data/${DATA_DIR}" \ @@ -111,7 +110,6 @@ function handle_master_upgrade() { > /var/lib/pgsql/data/check_result CHECK_CODE=$? - set -e if [[ "$CHECK_CODE" -ne 0 ]]; then echo "[$(date +%Y-%m-%dT%H:%M:%S)] Check cluster before upgrade - Failed." @@ -214,6 +212,8 @@ function check_user(){ fi fi + set +e + fi } @@ -246,8 +246,8 @@ check_pgsql_version if [[ "${TYPE}" == "master" ]]; then handle_master_upgrade - exit $? elif [[ "${TYPE}" == "replica" ]]; then handle_replica_upgrade - exit $? fi + +exit 0