github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

integration: Cleanup containerd on test teardown

Browse Source 
On Windows, we were only killing the keepalive process, and the
containerd process would keep running.

keepalive and containerd have the same PGID, so we can use that information
to kill both of them.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
This commit is contained in:
Claudiu Belu 2021-06-01 15:22:31 +00:00
parent c8b33ba297
commit 2f870aa896
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
script/test/utils.sh
View File

@ -79,7 +79,7 @@ CONTAINERD_FLAGS+="--address ${TRIMMED_CONTAINERD_SOCK} \
--state ${CONTAINERD_STATE} \ --state ${CONTAINERD_STATE} \
--root ${CONTAINERD_ROOT}" --root ${CONTAINERD_ROOT}"
kill_containerd_cmd= pid=
# NOTE: We don't have the sudo command on Windows. # NOTE: We don't have the sudo command on Windows.
sudo="" sudo=""
@ -103,12 +103,6 @@ test_setup() {
pid=$! pid=$!
set +m set +m
if [ $IS_WINDOWS -eq 1 ]; then
kill_containerd_cmd="${sudo} kill ${pid}"
else
kill_containerd_cmd="${sudo} pkill -g $(ps -o pgid= -p ${pid})"
fi
# Wait for containerd to be running by using the containerd client ctr to check the version # Wait for containerd to be running by using the containerd client ctr to check the version
# of the containerd server. Wait an increasing amount of time after each of five attempts # of the containerd server. Wait an increasing amount of time after each of five attempts
local -r crictl_path=$(which crictl) local -r crictl_path=$(which crictl)
@ -122,8 +116,14 @@ test_setup() {
# test_teardown kills containerd. # test_teardown kills containerd.
test_teardown() { test_teardown() {
if [ -n "${kill_containerd_cmd}" ]; then if [ -n "${pid}" ]; then
${kill_containerd_cmd} if [ $IS_WINDOWS -eq 1 ]; then
# NOTE(claudiub): The containerd process will have the same PGID as the keepalive process,
# so we can kill both of them by matching the PGID.
${sudo} ps | awk "{if (\$3 == ${pid}) print \$1}" | xargs kill
else
${sudo} pkill -g $(ps -o pgid= -p ${pid})
fi
fi fi
} }