openstack
/
tripleo-common
Code Issues Proposed changes

Make the clustercheck healthcheck work with socat 

Since [1] clustercheck can now use socat instead of xinetd,
so make sure the clustercheck healthcheck gets configured
with the right information based on which method is used.

Tested by deploying a standone with socat, and another one
with xinetd.

[1] I7d87b5861a576cf4849a25cd1d3f5e77568de1e4

Change-Id: Ib4ec4d10c00bc5cba16598c4d48829bf0af63b25
Closes-Bug: #1930399
(cherry picked from commit 37369ca44b)
This commit is contained in:
Damien Ciabrini 2021-06-01 14:16:17 +02:00 committed by Alex Schultz
parent a1499e3674
commit 4197668875
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
healthcheck/mariadb
View File

@ -2,15 +2,26 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
GALERA_XINETD_CONF='/etc/xinetd.d/galera-monitor'
SOCAT_CONF=/etc/sysconfig/clustercheck
IS_MYSQL=
# If the mariadb container is running xinetd with galera-monitor then it is a
# clustercheck container, otherwise a mysql/mariadb one
# If the mariadb container is running xinetd with galera-monitor or socat then
# it is a clustercheck container, otherwise a mysql/mariadb one
if pgrep xinetd &> /dev/null && grep -qe 'disable.*no' $GALERA_XINETD_CONF; then
PORT=$(awk '/port.*=/{ print $3 }' $GALERA_XINETD_CONF)
ADDR=$(awk '/bind.*=/{ print $3 }' $GALERA_XINETD_CONF)
elif pgrep -a socat 2> /dev/null | grep -w clustercheck; then
TRIPLEO_SOCAT_BIND=$(sed -nE "s/^TRIPLEO_SOCAT_BIND='?([^']*)'?$/\1/p" $SOCAT_CONF)
PORT=$(echo $TRIPLEO_SOCAT_BIND | sed -n -E 's/.*listen:([0-9]*),.*/\1/p')
ADDR=$(echo $TRIPLEO_SOCAT_BIND | sed -n -E 's/.*bind="?([^",]*)"?,?.*/\1/p')
else
IS_MYSQL=1
fi
if [ -n "$IS_MYSQL" ]; then
mysql -e 'select 1' || exit 1
else
bind_host=${ADDR:-$(hostname)}
bind_port=${PORT:-9200}
healthcheck_curl http://${bind_host}:${bind_port}/
else
mysql -e 'select 1' || exit 1
fi