Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixups to tests/int/checkpoint.bats #2476

Merged
merged 2 commits into from
Jun 24, 2020
Merged

fixups to tests/int/checkpoint.bats #2476

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6ddabd
tests/int/checkpoint: whitespace cleanups
kolyshkin Jun 16, 2020
e232a71
tests/int/checkpoint: fix checks, add logs
kolyshkin Jun 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions tests/integration/checkpoint.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function teardown() {
function setup_pipes() {
# The changes to 'terminal' are needed for running in detached mode
update_config ' (.. | select(.terminal? != null)) .terminal |= false
| (.. | select(.[]? == "sh")) += ["-c", "for i in `seq 10`; do read xxx || continue; echo ponG $xxx; done"]'
| (.. | select(.[]? == "sh")) += ["-c", "for i in `seq 10`; do read xxx || continue; echo ponG $xxx; done"]'

# Create two sets of pipes
# for stdout/stderr
Expand Down Expand Up @@ -58,9 +58,8 @@ function simple_cr() {

# restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox
ret=$?
cat ./work-dir/restore.log | grep -B 5 Error || true
[ "$ret" -eq 0 ]
[ "$status" -eq 0 ]

# busybox should be back up and running
testcontainer test_busybox running
Expand All @@ -76,7 +75,7 @@ function simple_cr() {
requires cgroups_v1

# enable CGROUPNS
update_config '.linux.namespaces += [{"type": "cgroup"}]'
update_config '.linux.namespaces += [{"type": "cgroup"}]'

simple_cr
}
Expand Down Expand Up @@ -134,7 +133,7 @@ function simple_cr() {
setup_pipes

# This should not be necessary: https://github.com/checkpoint-restore/criu/issues/575
update_config '(.. | select(.readonly? != null)) .readonly |= false'
update_config '(.. | select(.readonly? != null)) .readonly |= false'

# TCP port for lazy migration
port=27277
Expand Down Expand Up @@ -181,7 +180,9 @@ function simple_cr() {
# Killing the CRIU on the checkpoint side will let the container
# continue to run if the migration failed at some point.
__runc --criu "$CRIU" restore -d --work-path ./image-dir --image-path ./image-dir --lazy-pages test_busybox_restore <&60 >&51 2>&51
[ $? -eq 0 ]
ret=$?
cat ./work-dir/restore.log | grep -B 5 Error || true
[ $ret -eq 0 ]

# busybox should be back up and running
testcontainer test_busybox_restore running
Expand Down Expand Up @@ -268,7 +269,7 @@ function simple_cr() {
tmplog2=`basename $tmplog2`
# This adds the annotation 'org.criu.config' to set a container
# specific CRIU config file.
update_config '.annotations += {"org.criu.config": "'"$tmp"'"}'
update_config '.annotations += {"org.criu.config": "'"$tmp"'"}'

# Tell CRIU to use another configuration file
mkdir -p /etc/criu
Expand All @@ -283,6 +284,7 @@ function simple_cr() {

# checkpoint the running container
runc --criu "$CRIU" checkpoint --work-path ./work-dir test_busybox
cat ./work-dir/dump.log | grep -B 5 Error || true
[ "$status" -eq 0 ]
AkihiroSuda marked this conversation as resolved.
Show resolved Hide resolved
! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2
Expand All @@ -293,6 +295,7 @@ function simple_cr() {
test -f ./work-dir/$tmplog2 && unlink ./work-dir/$tmplog2
# restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox
cat ./work-dir/restore.log | grep -B 5 Error || true
[ "$status" -eq 0 ]
! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2
Expand Down