Merge "Revert "Revert "Fix a couple of Swift healthchecks""" into stable/victoria

This commit is contained in:
Zuul 2021-04-16 20:48:49 +00:00 committed by Gerrit Code Review
commit bdc7fe8597
9 changed files with 28 additions and 29 deletions

View File

@ -144,7 +144,7 @@ get_url_from_vhost () {
check_swift_interval () { check_swift_interval () {
service=$1 service=$1
if pgrep -f swift-${service} >&3 2>&1; then if ps -ef | grep --quiet [s]wift-${service} >&3 2>&1; then
interval=$(get_config_val $conf $service interval 300) interval=$(get_config_val $conf $service interval 300)
last=`grep -o "\"replication_last\": [0-9]*" $cache | cut -f 2 -d " "` last=`grep -o "\"replication_last\": [0-9]*" $cache | cut -f 2 -d " "`
now=`date +%s` now=`date +%s`

View File

@ -0,0 +1,6 @@
---
fixes:
- |
Fixes a few Swift healthchecks by using correct procps output filters. Also
merged a few healthcheck scripts because some containers do use the same
base images.

View File

@ -1,8 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
conf=/etc/swift/account-server.conf
cache=/var/cache/swift/account.recon
check_swift_interval account-replicator

View File

@ -5,7 +5,7 @@
conf=/etc/swift/account-server.conf conf=/etc/swift/account-server.conf
cache=/var/cache/swift/account.recon cache=/var/cache/swift/account.recon
if ps -e | grep --quiet swift-account-server; then if ps -ef | grep --quiet [s]wift-account-server; then
if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
echo "healthcheck is not available" >&2 echo "healthcheck is not available" >&2
exit 0 exit 0
@ -15,4 +15,6 @@ if ps -e | grep --quiet swift-account-server; then
bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1)) bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1))
bind_port=$(get_config_val $conf DEFAULT bind_port 6002) bind_port=$(get_config_val $conf DEFAULT bind_port 6002)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck healthcheck_curl http://${bind_host}:${bind_port}/healthcheck
elif ps -ef | grep --quiet [s]wift-account-replicator; then
check_swift_interval account-replicator
fi fi

View File

@ -1,8 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
conf=/etc/swift/container-server.conf
cache=/var/cache/swift/container.recon
check_swift_interval container-replicator

View File

@ -5,7 +5,7 @@
conf=/etc/swift/container-server.conf conf=/etc/swift/container-server.conf
cache=/var/cache/swift/container.recon cache=/var/cache/swift/container.recon
if ps -e | grep --quiet swift-container-server; then if ps -ef | grep --quiet [s]wift-container-server; then
if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
echo "healthcheck is not available" >&2 echo "healthcheck is not available" >&2
exit 0 exit 0
@ -15,4 +15,6 @@ if ps -e | grep --quiet swift-container-server; then
bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1)) bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1))
bind_port=$(get_config_val $conf DEFAULT bind_port 6001) bind_port=$(get_config_val $conf DEFAULT bind_port 6001)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck healthcheck_curl http://${bind_host}:${bind_port}/healthcheck
elif ps -ef | grep --quiet [s]wift-container-replicator; then
check_swift_interval container-replicator
fi fi

View File

@ -1,8 +0,0 @@
#!/bin/bash
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
conf=/etc/swift/object-server.conf
cache=/var/cache/swift/object.recon
check_swift_interval object-replicator

View File

@ -5,7 +5,7 @@
conf=/etc/swift/object-server.conf conf=/etc/swift/object-server.conf
cache=/var/cache/swift/object.recon cache=/var/cache/swift/object.recon
if ps -e | grep --quiet swift-object-server; then if ps -ef | grep --quiet [s]wift-object-server; then
if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
echo "healthcheck is not available" >&2 echo "healthcheck is not available" >&2
exit 0 exit 0
@ -15,4 +15,17 @@ if ps -e | grep --quiet swift-object-server; then
bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1)) bind_host=$(wrap_ipv6 $(get_config_val $conf DEFAULT bind_ip 127.0.0.1))
bind_port=$(get_config_val $conf DEFAULT bind_port 6000) bind_port=$(get_config_val $conf DEFAULT bind_port 6000)
healthcheck_curl http://${bind_host}:${bind_port}/healthcheck healthcheck_curl http://${bind_host}:${bind_port}/healthcheck
elif ps -ef | grep --quiet [s]wift-object-replicator; then
check_swift_interval object-replicator
elif ps -ef | grep --quiet rsync; then
process='rsync'
args="${@:-873}"
if healthcheck_listen $process $args; then
exit 0
else
ports=${args// /,}
echo "There is no $process process, listening on port(s) $ports, running in the container."
exit 1
fi
fi fi

View File

@ -2,7 +2,7 @@
. ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh . ${HEALTHCHECK_SCRIPTS:-/usr/share/openstack-tripleo-common/healthcheck}/common.sh
if pgrep -f swift-proxy-server; then if ps -ef | grep --quiet [s]wift-proxy-server; then
conf=/etc/swift/proxy-server.conf conf=/etc/swift/proxy-server.conf
if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then