From 1f47a3466cfafed504f85177a724a89d361731ca Mon Sep 17 00:00:00 2001 From: Neil MacDougall Date: Wed, 27 Jun 2018 15:17:57 +0100 Subject: [PATCH] Postflight script times out if it can not connect --- deploy/db/scripts/run-postflight-job.k8s.sh | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/deploy/db/scripts/run-postflight-job.k8s.sh b/deploy/db/scripts/run-postflight-job.k8s.sh index bae1fccbf4..ee065eb2c9 100755 --- a/deploy/db/scripts/run-postflight-job.k8s.sh +++ b/deploy/db/scripts/run-postflight-job.k8s.sh @@ -1,7 +1,22 @@ #!/bin/bash -set -e +echo "=== Stratos Postlight Job ===" echo "Running postflight job" -MYSQL_CMD="mysql -u $DB_ADMIN_USER -h $DB_HOST -P $DB_PORT -p$DB_ADMIN_PASSWORD -e" + +# mysql commands will timeout after 5 seconds +MYSQL_CMD="mysql -u $DB_ADMIN_USER -h $DB_HOST -P $DB_PORT -p$DB_ADMIN_PASSWORD --connect_timeout 5 -e" + +echo "Checking if DB Server is ready" +dbServerVersion=$(${MYSQL_CMD} "SELECT VERSION();" --skip-column-names) +if [ $? -eq 1 ]; then + echo "Failed to connect to database server - it is not ready yet .. bailing for now..." + exit 1 +fi + +echo "Database Server is ready" +echo $dbServerVersion + +set -e + echo "Checking if DB exists..." stratosDbExists=$(${MYSQL_CMD} "SELECT SCHEMA_NAME FROM INFORMATION_SCHEMA.SCHEMATA WHERE SCHEMA_NAME = '$DB_DATABASE_NAME';") DBCONF_KEY=mariadb-k8s