diff options
| author | Zuul <zuul@review.opendev.org> | 2021-05-06 15:16:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-05-06 15:16:37 +0000 |
| commit | ef0a578c48a2736a79f9f45e98604e536936882b (patch) | |
| tree | 0e11746421d48a9754d003eadb59d7c3e7e92f50 | |
| parent | 68fc72cd5d5003025da53cd1160e9cd19367cb10 (diff) | |
| parent | 407d774ffb36b8acfe0898b769150c76b741b82d (diff) | |
| download | kolla-ef0a578c48a2736a79f9f45e98604e536936882b.tar.gz kolla-ef0a578c48a2736a79f9f45e98604e536936882b.zip | |
Merge "Modify healthcheck_mariadb"
| -rwxr-xr-x | docker/mariadb/mariadb-server/healthcheck_mariadb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/mariadb/mariadb-server/healthcheck_mariadb b/docker/mariadb/mariadb-server/healthcheck_mariadb index b79b19bb4..0d9f59a95 100755 --- a/docker/mariadb/mariadb-server/healthcheck_mariadb +++ b/docker/mariadb/mariadb-server/healthcheck_mariadb @@ -1,11 +1,13 @@ #!/bin/bash +set -e + MYSQL_USERNAME="${MYSQL_USERNAME:=-haproxy}" MYSQL_TIMEOUT=10 -MYSQL_CMDLINE="mysql -nNE --connect-timeout=${MYSQL_TIMEOUT} -u ${MYSQL_USERNAME}" +MYSQL_CMDLINE="mysql -sN --connect-timeout=${MYSQL_TIMEOUT} -u ${MYSQL_USERNAME}" -WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state_comment';") +WSREP_STATUS=$($MYSQL_CMDLINE -e "SHOW STATUS LIKE 'wsrep_local_state_comment';" | awk '{print $2}') if [[ "${WSREP_STATUS}" == "Synced" ]] then @@ -13,5 +15,5 @@ then exit 0 else echo "MariaDB Galera Cluster Node is NOT synced" - exit 0 + exit 1 fi |