diff --git a/jobs/mysql/spec b/jobs/mysql/spec index f4219669..184c27e2 100644 --- a/jobs/mysql/spec +++ b/jobs/mysql/spec @@ -84,7 +84,7 @@ properties: description: 'Maximum total number of database connections for the node' default: 1500 cf_mysql.mysql.enable_drain_healthcheck: - description: 'When this is enabled, the --skip-drain flag is required in order to delete a deployment. Drain healthcheck cannot be enabled when using the arbitrator. Enabling this ensures mysql nodes will verify the health of all other nodes before draining.' + description: 'When this is enabled, the --skip-drain flag is required in order to delete a deployment and scaling down of instances. Drain healthcheck cannot be enabled when using the arbitrator. Enabling this ensures mysql nodes will verify the health of all other nodes before draining.' default: false cf_mysql.mysql.tls.ca_certificate: description: 'CA Certificate which signed the server certificate' diff --git a/jobs/mysql/templates/drain.sh b/jobs/mysql/templates/drain.sh index 457a1047..a8a4d39c 100644 --- a/jobs/mysql/templates/drain.sh +++ b/jobs/mysql/templates/drain.sh @@ -26,7 +26,7 @@ for NODE in "${CLUSTER_NODES[@]}"; do set +e status_code=$(curl -s -o "/dev/null" -w "%{http_code}" "$NODE:$GALERA_HEALTHCHECK_PORT") set -e - if [[ $status_code -eq 000 || $status_code -eq 200 ]]; then + if [ $status_code -eq 200 ]; then continue else echo "$(date): galera heathcheck returned $status_code; drain failed on node ${NODE}" >> "${LOG_DIR}/drain.err.log"