openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix sending SIGTERM to the sidecar containers" into stable/ussuri

This commit is contained in:
Zuul 2020-06-01 23:04:12 +00:00 committed by Gerrit Code Review
parent 4ab32733a1 d6e86c4cfc
commit fda5a35285
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
deployment/neutron/kill-script
View File

@ -40,9 +40,13 @@ kill_container() {
$CLI rm $2 $CLI rm $2
} }
hup_container() { signal_container() {
add_date "Sending HUP signal to $1 ($2)" SIGNAL=$3
$CLI kill --signal HUP $2 if [ -z "$SIGNAL" ]; then
SIGNAL="HUP"
fi
add_date "Sending signal '$SIGNAL' to $1 ($2)"
$CLI kill --signal $SIGNAL $2
} }
{% raw -%} {% raw -%}
@ -53,13 +57,16 @@ if [ -f /proc/$PID/cgroup ]; then
case $SIG in case $SIG in
HUP) HUP)
hup_container $CT_NAME $CT_ID signal_container $CT_NAME $CT_ID
;; ;;
9) 9)
kill_container $CT_NAME $CT_ID kill_container $CT_NAME $CT_ID
;; ;;
15)
signal_container $CT_NAME $CT_ID 15
;;
*) *)
add_date "Unknown action ${SIG} for ${$CT_NAME} ${CT_ID}" add_date "Unknown action ${SIG} for ${CT_NAME} ${CT_ID}"
exit 1 exit 1
;; ;;
esac esac