From 722275c3d1a7b420915e6e6a3d623ae941c494cf Mon Sep 17 00:00:00 2001 From: Googler Date: Wed, 6 Jun 2018 11:43:01 -0700 Subject: Added a function to the controller to checkpoint a container. Functionality for checkpoint is not complete, more to come. PiperOrigin-RevId: 199500803 Change-Id: Iafb0fcde68c584270000fea898e6657a592466f7 --- runsc/boot/controller.go | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'runsc/boot/controller.go') diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go index 8fc0a9076..095b0a9b9 100644 --- a/runsc/boot/controller.go +++ b/runsc/boot/controller.go @@ -22,9 +22,13 @@ import ( "gvisor.googlesource.com/gvisor/pkg/sentry/control" "gvisor.googlesource.com/gvisor/pkg/sentry/kernel" "gvisor.googlesource.com/gvisor/pkg/sentry/socket/epsocket" + "gvisor.googlesource.com/gvisor/pkg/sentry/watchdog" ) const ( + // ContainerCheckpoint checkpoints a container. + ContainerCheckpoint = "containerManager.Checkpoint" + // ContainerEvent is the URPC endpoint for getting stats about the // container used by "runsc events". ContainerEvent = "containerManager.Event" @@ -69,7 +73,7 @@ type controller struct { } // newController creates a new controller and starts it listening. -func newController(fd int, k *kernel.Kernel) (*controller, error) { +func newController(fd int, k *kernel.Kernel, w *watchdog.Watchdog) (*controller, error) { srv, err := server.CreateFromFD(fd) if err != nil { return nil, err @@ -79,6 +83,7 @@ func newController(fd int, k *kernel.Kernel) (*controller, error) { startChan: make(chan struct{}), startResultChan: make(chan error), k: k, + watchdog: w, } srv.Register(manager) @@ -113,6 +118,9 @@ type containerManager struct { // k is the emulated linux kernel on which the sandboxed // containers run. k *kernel.Kernel + + // watchdog is the kernel watchdog. + watchdog *watchdog.Watchdog } // StartRoot will start the root container process. @@ -136,6 +144,15 @@ func (cm *containerManager) Execute(e *control.ExecArgs, waitStatus *uint32) err return nil } +// Checkpoint pauses a sandbox and saves its state. +func (cm *containerManager) Checkpoint(o *control.SaveOpts, _ *struct{}) error { + state := control.State{ + Kernel: cm.k, + Watchdog: cm.watchdog, + } + return state.Save(o, nil) +} + // Wait waits for the init process in the given container. func (cm *containerManager) Wait(cid *string, waitStatus *uint32) error { // TODO: Use the cid and wait on the init process in that -- cgit v1.2.3