proxmox-mirrors/mirror_lxc
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_lxc synced 2025-08-07 15:04:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tests: lxc-test-checkpoint-restore: use trap to do cleanup

Browse Source 
This test will fail on Jammy 5.15, and because of the "set -e" it
will never go through the lxc-stop and lxc-destroy code in the end
of this script. Thus the lxc-test-criu container will not be removed.

Compose a cleanup() and use TRAP to solve this problem.

Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
This commit is contained in:
Po-Hsu Lin 2022-10-19 14:17:29 +08:00 committed by Stéphane Graber
parent 77e08b8878
commit 495b1bbf45
No known key found for this signature in database
GPG Key ID: C638974D64792D67
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/tests/lxc-test-checkpoint-restore
View File

@ -10,6 +10,12 @@ FAIL() {
exit 1 exit 1
} }
cleanup() {
set +e
lxc-stop -n $name -k
lxc-destroy -f -n $name
}
if [ "$(id -u)" != "0" ]; then if [ "$(id -u)" != "0" ]; then
echo "ERROR: Must run as root." echo "ERROR: Must run as root."
exit 1 exit 1
@ -27,6 +33,7 @@ if verlte "$criu_version" "1.3.1"; then
fi fi
name=lxc-test-criu name=lxc-test-criu
trap cleanup EXIT HUP INT TERM
lxc-create -t busybox -n $name || FAIL "creating container" lxc-create -t busybox -n $name || FAIL "creating container"
cat >> "$(lxc-config lxc.lxcpath)/$name/config" <<EOF cat >> "$(lxc-config lxc.lxcpath)/$name/config" <<EOF
@ -47,6 +54,3 @@ sleep 5s
lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing" lxc-checkpoint -n $name -v -s -D /tmp/checkpoint || FAIL "failed checkpointing"
lxc-wait -n $name -s STOPPED lxc-wait -n $name -s STOPPED
lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring" lxc-checkpoint -n $name -v -r -D /tmp/checkpoint || FAIL "failed restoring"
lxc-stop -n $name -k
lxc-destroy -f -n $name