jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2476 from kolyshkin/cpt-err-log 

fixups to tests/int/checkpoint.bats
This commit is contained in:
Mrunal Patel 2020-06-23 18:13:56 -07:00 committed by GitHub
parent 834c45736b e232a71a3d
commit 1b94395c06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tests/integration/checkpoint.bats
View File

@ -17,7 +17,7 @@ function teardown() {
function setup_pipes() { function setup_pipes() {
# The changes to 'terminal' are needed for running in detached mode # The changes to 'terminal' are needed for running in detached mode
update_config ' (.. | select(.terminal? != null)) .terminal |= false 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 # Create two sets of pipes
# for stdout/stderr # for stdout/stderr
@ -58,9 +58,8 @@ function simple_cr() {
# restore from checkpoint # restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox 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 cat ./work-dir/restore.log | grep -B 5 Error || true
[ "$ret" -eq 0 ] [ "$status" -eq 0 ]
# busybox should be back up and running # busybox should be back up and running
testcontainer test_busybox running testcontainer test_busybox running
@ -76,7 +75,7 @@ function simple_cr() {
requires cgroups_v1 requires cgroups_v1
# enable CGROUPNS # enable CGROUPNS
update_config '.linux.namespaces += [{"type": "cgroup"}]' update_config '.linux.namespaces += [{"type": "cgroup"}]'
simple_cr simple_cr
} }
@ -134,7 +133,7 @@ function simple_cr() {
setup_pipes setup_pipes
# This should not be necessary: https://github.com/checkpoint-restore/criu/issues/575 # 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 # TCP port for lazy migration
port=27277 port=27277
@ -181,7 +180,9 @@ function simple_cr() {
# Killing the CRIU on the checkpoint side will let the container # Killing the CRIU on the checkpoint side will let the container
# continue to run if the migration failed at some point. # 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 __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 # busybox should be back up and running
testcontainer test_busybox_restore running testcontainer test_busybox_restore running
@ -268,7 +269,7 @@ function simple_cr() {
tmplog2=`basename $tmplog2` tmplog2=`basename $tmplog2`
# This adds the annotation 'org.criu.config' to set a container # This adds the annotation 'org.criu.config' to set a container
# specific CRIU config file. # 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 # Tell CRIU to use another configuration file
mkdir -p /etc/criu mkdir -p /etc/criu
@ -283,6 +284,7 @@ function simple_cr() {
# checkpoint the running container # checkpoint the running container
runc --criu "$CRIU" checkpoint --work-path ./work-dir test_busybox runc --criu "$CRIU" checkpoint --work-path ./work-dir test_busybox
cat ./work-dir/dump.log | grep -B 5 Error || true
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
! test -f ./work-dir/$tmplog1 ! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2 test -f ./work-dir/$tmplog2
@ -293,6 +295,7 @@ function simple_cr() {
test -f ./work-dir/$tmplog2 && unlink ./work-dir/$tmplog2 test -f ./work-dir/$tmplog2 && unlink ./work-dir/$tmplog2
# restore from checkpoint # restore from checkpoint
runc --criu "$CRIU" restore -d --work-path ./work-dir --console-socket $CONSOLE_SOCKET test_busybox 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 ] [ "$status" -eq 0 ]
! test -f ./work-dir/$tmplog1 ! test -f ./work-dir/$tmplog1
test -f ./work-dir/$tmplog2 test -f ./work-dir/$tmplog2