mirror of
https://github.com/opencontainers/runc.git
synced 2025-04-20 07:07:47 +03:00
ca1d135bd4
1. The command `runc checkpoint --lazy-server --status-fd $FD` actually accepts a file name as an $FD. Make it accept a file descriptor, like its name implies and the documentation states. In addition, since runc itself does not use the result of CRIU status fd, remove the code which relays it, and pass the FD directly to CRIU. Note 1: runc should close this file descriptor itself after passing it to criu, otherwise whoever waits on it might wait forever. Note 2: due to the way criu swrk consumes the fd (it reopens /proc/$SENDER_PID/fd/$FD), runc can't close it as soon as criu swrk has started. There is no good way to know when criu swrk has reopened the fd, so we assume that as soon as we have received something back, the fd is already reopened. 2. Since the meaning of --status-fd has changed, the test case using it needs to be fixed as well. Modify the lazy migration test to remove "sleep 2", actually waiting for the the lazy page server to be ready. While at it, - remove the double fork (using shell's background process is sufficient here); - check the exit code for "runc checkpoint" and "criu lazy-pages"; - remove the check for no errors in dump.log after restore, as we are already checking its exit code. [v2: properly close status fd after spawning criu] [v3: move close status fd to after the first read] Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
41 lines
2.1 KiB
Go
41 lines
2.1 KiB
Go
package libcontainer
|
|
|
|
// cgroup restoring strategy provided by criu
|
|
type cgMode uint32
|
|
|
|
const (
|
|
CRIU_CG_MODE_SOFT cgMode = 3 + iota // restore cgroup properties if only dir created by criu
|
|
CRIU_CG_MODE_FULL // always restore all cgroups and their properties
|
|
CRIU_CG_MODE_STRICT // restore all, requiring them to not present in the system
|
|
CRIU_CG_MODE_DEFAULT // the same as CRIU_CG_MODE_SOFT
|
|
)
|
|
|
|
type CriuPageServerInfo struct {
|
|
Address string // IP address of CRIU page server
|
|
Port int32 // port number of CRIU page server
|
|
}
|
|
|
|
type VethPairName struct {
|
|
ContainerInterfaceName string
|
|
HostInterfaceName string
|
|
}
|
|
|
|
type CriuOpts struct {
|
|
ImagesDirectory string // directory for storing image files
|
|
WorkDirectory string // directory to cd and write logs/pidfiles/stats to
|
|
ParentImage string // directory for storing parent image files in pre-dump and dump
|
|
LeaveRunning bool // leave container in running state after checkpoint
|
|
TcpEstablished bool // checkpoint/restore established TCP connections
|
|
ExternalUnixConnections bool // allow external unix connections
|
|
ShellJob bool // allow to dump and restore shell jobs
|
|
FileLocks bool // handle file locks, for safety
|
|
PreDump bool // call criu predump to perform iterative checkpoint
|
|
PageServer CriuPageServerInfo // allow to dump to criu page server
|
|
VethPairs []VethPairName // pass the veth to criu when restore
|
|
ManageCgroupsMode cgMode // dump or restore cgroup mode
|
|
EmptyNs uint32 // don't c/r properties for namespace from this mask
|
|
AutoDedup bool // auto deduplication for incremental dumps
|
|
LazyPages bool // restore memory pages lazily using userfaultfd
|
|
StatusFd int // fd for feedback when lazy server is ready
|
|
}
|