aboutsummaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorLinPeiWen <591171850@qq.com>2021-04-08 11:42:46 +0000
committerLin PeiWen <591171850@qq.com>2021-04-26 15:08:30 +0000
commit407d774ffb36b8acfe0898b769150c76b741b82d (patch)
tree0f3f418eb95e700d420794df4c5c34109b452fa0 /docker
parentab8ee75bda2df6a54bab63d90dd0a6542085704f (diff)
downloadkolla-407d774ffb36b8acfe0898b769150c76b741b82d.tar.gz
kolla-407d774ffb36b8acfe0898b769150c76b741b82d.zip
Modify healthcheck_mariadb
Use the healthcheck_mariadb script to check the status of mariadb Related patch of kolla-ansible: https://review.opendev.org/c/openstack/kolla-ansible/+/780404 Change-Id: I9e8fb8fab1adba03aba4ed9ce42e4d4666bc764b
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/mariadb/mariadb-server/healthcheck_mariadb8
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