zishuo/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2025-10-05 15:37:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4696 from avagin/criu-vs-exec

Browse Source 
criu: Add time namespace to container config after checkpoint/restore
This commit is contained in:
Rodrigo Campos
2025-04-01 14:54:33 -03:00
committed by GitHub
parent f88669c0c9 b68cbdff34
commit c3a41d77db
2 changed files with 42 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libcontainer/criu_linux.go
View File

@@ -1151,6 +1151,13 @@ func (c *Container) criuNotifications(resp *criurpc.CriuResp, process *Process,
} }
// create a timestamp indicating when the restored checkpoint was started // create a timestamp indicating when the restored checkpoint was started
c.created = time.Now().UTC() c.created = time.Now().UTC()
if !c.config.Namespaces.Contains(configs.NEWTIME) &&
configs.IsNamespaceSupported(configs.NEWTIME) &&
c.checkCriuVersion(31400) == nil {
// CRIU restores processes into a time namespace.
c.config.Namespaces = append(c.config.Namespaces,
configs.Namespace{Type: configs.NEWTIME})
}
if _, err := c.updateState(r); err != nil { if _, err := c.updateState(r); err != nil {
return err return err
} }

35
tests/integration/checkpoint.bats
View File

@@ -441,3 +441,38 @@ function simple_cr() {
pid=$(cat "pid") pid=$(cat "pid")
grep -q "${REL_CGROUPS_PATH}$" "/proc/$pid/cgroup" grep -q "${REL_CGROUPS_PATH}$" "/proc/$pid/cgroup"
} }
@test "checkpoint/restore and exec" {
runc run -d --console-socket "$CONSOLE_SOCKET" test_busybox
[ "$status" -eq 0 ]
testcontainer test_busybox running
local execed_pid=""
for _ in $(seq 2); do
# checkpoint the running container
runc checkpoint --work-path ./work-dir test_busybox
[ "$status" -eq 0 ]
# after checkpoint busybox is no longer running
testcontainer test_busybox checkpointed
# restore from checkpoint
runc restore -d --work-path ./work-dir --console-socket "$CONSOLE_SOCKET" test_busybox
[ "$status" -eq 0 ]
# busybox should be back up and running
testcontainer test_busybox running
# verify that previously exec'd process is restored.
if [ -n "$execed_pid" ]; then
runc exec test_busybox ls -ld "/proc/$execed_pid"
[ "$status" -eq 0 ]
fi
# exec a new background process.
runc exec test_busybox sh -c 'sleep 1000 < /dev/null &> /dev/null & echo $!'
[ "$status" -eq 0 ]
execed_pid=$output
done
}