openstack
/
tripleo-common
Code Issues Proposed changes

Silent file descriptor checks 

In order to avoid spam in journald, we just get the exit code and let
the checker output the error message.

Also, correct how we retrieve process in the healthcheck_port and _listen
functions.
"ss" doesn't allow to match some processes, like "neutron-l3-agent". We
therefore use the PID instead, provided by "pgrep".
The "-d" option of pgrep allow to prepare its output for the "grep -E",
preventing any need of a loop.

Change-Id: I1555a9b79c954e646fe9ae35272231c581cea03e
Closes-Bug: #1821782
Closes-Bug: #1821856
This commit is contained in:
Cédric Jeanneret 2019-03-27 08:58:24 +01:00
parent ee419b6e9c
commit 5312bf19c8
1 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
healthcheck/common.sh
View File

@ -16,31 +16,21 @@ healthcheck_curl () {
healthcheck_port () {
process=$1
# ss truncate command name to 15 characters and this behaviour
# cannot be disabled
if [ ${#process} -gt 15 ] ; then
process=${process:0:15}
fi
shift 1
args=$@
ports=${args// /|}
ss -ntp | awk '{print $5,"-",$6}' | egrep ":($ports)" | grep "$process"
pids=$(pgrep -d '|' -f $process)
ss -ntp | grep -qE ":($ports).*,pid=($pids),"
}
healthcheck_listen () {
process=$1
# ss truncate command name to 15 characters and this behaviour
# cannot be disabled
if [ ${#process} -gt 15 ] ; then
process=${process:0:15}
fi
shift 1
args=$@
ports=${args// /|}
ss -lnp | awk '{print $5,"-",$7}' | egrep ":($ports)" | grep "$process"
pids=$(pgrep -d '|' -f $process)
ss -lnp | grep -qE ":($ports).*,pid=($pids),"
}
healthcheck_socket () {
@ -52,7 +42,7 @@ healthcheck_socket () {
if [ ${#process} -gt 15 ] ; then
process=${process:0:15}
fi
lsof -Fc -Ua $socket | grep "c$process"
lsof -Fc -Ua $socket | grep -q "c$process"
}
healthcheck_file_modification () {