Revert "Fix a couple of Swift healthchecks"

This reverts commit 4cd3bd8fdc.

Closes-Bug: #1909105
Change-Id: I005027441229469e4d4b4c90506ccf41f486d174
Tested here: https://review.rdoproject.org/r/#/c/31424/

container-images/tcib/base/os/swift-base/swift-account/swift-account.yaml

@@ -1,6 +1,6 @@
 tcib_actions:
 - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
-- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-account /openstack/healthcheck && chmod a+rx /openstack/healthcheck
+- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-account-server /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - openstack-swift-account

container-images/tcib/base/os/swift-base/swift-container/swift-container.yaml

@@ -1,6 +1,6 @@
 tcib_actions:
 - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
-- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-container /openstack/healthcheck && chmod a+rx /openstack/healthcheck
+- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-container-server /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - openstack-swift-container

container-images/tcib/base/os/swift-base/swift-object/swift-object.yaml

@@ -1,6 +1,6 @@
 tcib_actions:
 - run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
-- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-object /openstack/healthcheck && chmod a+rx /openstack/healthcheck
+- run: ln -s /usr/share/openstack-tripleo-common/healthcheck/swift-object-server /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - openstack-swift-object

healthcheck/common.sh

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

healthcheck/releasenotes/notes/swift-fix-healthchecks-b3a02139230f4258.yaml

@@ -1,6 +0,0 @@
----
-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.

healthcheck/swift-account-replicator

@@ -0,0 +1,8 @@
+#!/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

healthcheck/swift-account-server

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

healthcheck/swift-container-replicator

@@ -0,0 +1,8 @@
+#!/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

healthcheck/swift-container-server

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

healthcheck/swift-object-replicator

@@ -0,0 +1,8 @@
+#!/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

healthcheck/swift-object-server

@@ -5,7 +5,7 @@
 conf=/etc/swift/object-server.conf
 cache=/var/cache/swift/object.recon
 
-if ps -ef | grep --quiet [s]wift-object-server; then
+if ps -e | grep --quiet swift-object-server; then
     if ! crudini --get $conf pipeline:main pipeline | grep -q healthcheck; then
         echo "healthcheck is not available" >&2
         exit 0
@@ -15,17 +15,4 @@ if ps -ef | grep --quiet [s]wift-object-server; then
     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)
     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

healthcheck/swift-proxy

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