From ab1c86b60a90f089f4c979e5471fd5c5b4a1fb40 Mon Sep 17 00:00:00 2001 From: boucher Date: Tue, 5 May 2015 19:21:03 -0700 Subject: [PATCH] Update to latest criu libcontainer --- .../docker/libcontainer/container_linux.go | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/vendor/src/github.com/docker/libcontainer/container_linux.go b/vendor/src/github.com/docker/libcontainer/container_linux.go index 035831af47f4f..76937bd0da13f 100644 --- a/vendor/src/github.com/docker/libcontainer/container_linux.go +++ b/vendor/src/github.com/docker/libcontainer/container_linux.go @@ -279,13 +279,15 @@ func (c *linuxContainer) checkCriuVersion() error { return fmt.Errorf("Unable to parse the CRIU version: %s", out) } - if x*10000+y*100+z < 10501 { - return fmt.Errorf("CRIU version must be 1.5.1 or higher") + if x*10000+y*100+z < 10502 { + return fmt.Errorf("CRIU version must be 1.5.2 or higher") } return nil } +const descriptors_filename = "descriptors.json" + func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error { c.m.Lock() defer c.m.Unlock() @@ -374,7 +376,7 @@ func (c *linuxContainer) Checkpoint(criuOpts *CriuOpts) error { return err } - err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, "std_fds.json"), fdsJSON, 0655) + err = ioutil.WriteFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename), fdsJSON, 0655) if err != nil { return err } @@ -488,14 +490,16 @@ func (c *linuxContainer) Restore(process *Process, criuOpts *CriuOpts) error { } } - var fds []string - fdJSON, err := ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, "std_fds.json")) - if err != nil { + var ( + fds []string + fdJSON []byte + ) + + if fdJSON, err = ioutil.ReadFile(filepath.Join(criuOpts.ImagesDirectory, descriptors_filename)); err != nil { return err } - err = json.Unmarshal(fdJSON, &fds) - if err != nil { + if err = json.Unmarshal(fdJSON, &fds); err != nil { return err }