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

Don't write a "checkpoint" file if the process is left running. 

Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com> (github: boucher)
This commit is contained in:
boucher 2015-04-20 16:24:15 -07:00 committed by Michael Crosby
parent a8d5fdf1fd
commit 4fc7543317
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
container_linux.go
View File

@ -355,13 +355,12 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error {
extMnt := new(criurpc.ExtMountMap) extMnt := new(criurpc.ExtMountMap)
extMnt.Key = proto.String(mountDest) extMnt.Key = proto.String(mountDest)
extMnt.Key = proto.String(m.Destination)
extMnt.Val = proto.String(m.Destination) extMnt.Val = proto.String(m.Destination)
req.Opts.ExtMnt = append(req.Opts.ExtMnt, extMnt) req.Opts.ExtMnt = append(req.Opts.ExtMnt, extMnt)
} }
} }
err = c.criuSwrk(nil, &req, criuOpts.ImagesDirectory) err = c.criuSwrk(nil, &req, criuOpts)
if err != nil { if err != nil {
log.Errorf(filepath.Join(criuOpts.WorkDirectory, "dump.log")) log.Errorf(filepath.Join(criuOpts.WorkDirectory, "dump.log"))
return err return err
@ -476,7 +475,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
} }
} }
err = c.criuSwrk(process, &req, criuOpts.ImagesDirectory) err = c.criuSwrk(process, &req, criuOpts)
if err != nil { if err != nil {
log.Errorf(filepath.Join(criuOpts.WorkDirectory, "restore.log")) log.Errorf(filepath.Join(criuOpts.WorkDirectory, "restore.log"))
return err return err
@ -486,7 +485,7 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error {
return nil return nil
} }
func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, imagePath string) error { func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, opts *CriuOpts) error {
fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_SEQPACKET|syscall.SOCK_CLOEXEC, 0) fds, err := syscall.Socketpair(syscall.AF_LOCAL, syscall.SOCK_SEQPACKET|syscall.SOCK_CLOEXEC, 0)
if err != nil { if err != nil {
return err return err
@ -566,7 +565,7 @@ func (c *linuxContainer) criuSwrk(process *Process, req *criurpc.CriuReq, imageP
t := resp.GetType() t := resp.GetType()
switch { switch {
case t == criurpc.CriuReqType_NOTIFY: case t == criurpc.CriuReqType_NOTIFY:
if err := c.criuNotifications(resp, process, imagePath); err != nil { if err := c.criuNotifications(resp, process, opts); err != nil {
return err return err
} }
t = criurpc.CriuReqType_NOTIFY t = criurpc.CriuReqType_NOTIFY
@ -633,7 +632,7 @@ func unlockNetwork(config *configs.Config) error {
return nil return nil
} }
func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Process, imagePath string) error { func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Process, opts *CriuOpts) error {
notify := resp.GetNotify() notify := resp.GetNotify()
if notify == nil { if notify == nil {
return fmt.Errorf("invalid response: %s", resp.String()) return fmt.Errorf("invalid response: %s", resp.String())
@ -641,11 +640,13 @@ func (c *linuxContainer) criuNotifications(resp *criurpc.CriuResp, process *Proc
switch { switch {
case notify.GetScript() == "post-dump": case notify.GetScript() == "post-dump":
f, err := os.Create(filepath.Join(c.root, "checkpoint")) if !opts.LeaveRunning {
if err != nil { f, err := os.Create(filepath.Join(c.root, "checkpoint"))
return err if err != nil {
return err
}
f.Close()
} }
f.Close()
break break
case notify.GetScript() == "network-unlock": case notify.GetScript() == "network-unlock":