openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove sidecar containers after SIGTERM is send to stop them" into stable/train

This commit is contained in:
Zuul 2022-05-31 15:50:53 +00:00 committed by Gerrit Code Review
parent abe9497da5 d6098ae57b
commit c22a67f121
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
deployment/neutron/kill-script
View File

@ -36,8 +36,7 @@ CLI='echo noop'
kill_container() {
add_date "Stopping container $1 ($2)"
$CLI stop $2
add_date "Deleting container $1 ($2)"
$CLI rm $2
delete_container $1 $2
}
signal_container() {
@ -49,6 +48,12 @@ signal_container() {
$CLI kill --signal $SIGNAL $2
}
delete_container() {
add_date "Deleting container $1 ($2)"
$CLI rm $2 || echo "Deleting container $1 ($2) failed"
}
{% raw -%}
if [ -f /proc/$PID/cgroup ]; then
# Get container ID based on process cgroups
@ -64,6 +69,7 @@ if [ -f /proc/$PID/cgroup ]; then
;;
15)
signal_container $CT_NAME $CT_ID 15
delete_container $CT_NAME $CT_ID
;;
*)
add_date "Unknown action ${SIG} for ${CT_NAME} ${CT_ID}"