From b1a3b030688e28e6d7473d998cabbf923a8064f9 Mon Sep 17 00:00:00 2001 From: umohnani8 Date: Wed, 22 Nov 2017 15:36:00 -0500 Subject: Update kpod pause and unpause to use new container state Signed-off-by: umohnani8 Closes: #66 Approved by: mheon --- libpod/container.go | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++-- libpod/oci.go | 10 ++++++++++ 2 files changed, 63 insertions(+), 2 deletions(-) (limited to 'libpod') diff --git a/libpod/container.go b/libpod/container.go index f0a6d58eb..8bd1a0abf 100644 --- a/libpod/container.go +++ b/libpod/container.go @@ -536,12 +536,63 @@ func (c *Container) Unmount() error { // Pause pauses a container func (c *Container) Pause() error { - return ErrNotImplemented + c.lock.Lock() + defer c.lock.Unlock() + + if err := c.syncContainer(); err != nil { + return err + } + + if c.state.State == ContainerStatePaused { + return errors.Wrapf(ErrCtrStateInvalid, "%q is already paused", c.ID()) + } + if c.state.State != ContainerStateRunning && c.state.State != ContainerStateCreated { + return errors.Wrapf(ErrCtrStateInvalid, "%q is not running/created, can't pause", c.state.State) + } + if err := c.runtime.ociRuntime.pauseContainer(c); err != nil { + return err + } + + logrus.Debugf("Paused container %s", c.ID()) + + // Update container's state as it should be ContainerStatePaused now + if err := c.runtime.ociRuntime.updateContainerStatus(c); err != nil { + return err + } + + if err := c.runtime.state.SaveContainer(c); err != nil { + return errors.Wrapf(err, "error saving container %s state", c.ID()) + } + return nil } // Unpause unpauses a container func (c *Container) Unpause() error { - return ErrNotImplemented + c.lock.Lock() + defer c.lock.Unlock() + + if err := c.syncContainer(); err != nil { + return err + } + + if c.state.State != ContainerStatePaused { + return errors.Wrapf(ErrCtrStateInvalid, "%q is not paused, can't unpause", c.ID()) + } + if err := c.runtime.ociRuntime.unpauseContainer(c); err != nil { + return err + } + + logrus.Debugf("Unpaused container %s", c.ID()) + + // Update container's state as it should be ContainerStateRunning now + if err := c.runtime.ociRuntime.updateContainerStatus(c); err != nil { + return err + } + + if err := c.runtime.state.SaveContainer(c); err != nil { + return errors.Wrapf(err, "error saving container %s state", c.ID()) + } + return nil } // Export exports a container's root filesystem as a tar archive diff --git a/libpod/oci.go b/libpod/oci.go index ddbd2f606..eb8bd0d93 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -345,3 +345,13 @@ func (r *OCIRuntime) startContainer(ctr *Container) error { return nil } + +// pauseContainer pauses the given container +func (r *OCIRuntime) pauseContainer(ctr *Container) error { + return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "pause", ctr.ID()) +} + +// unpauseContainer unpauses the given container +func (r *OCIRuntime) unpauseContainer(ctr *Container) error { + return utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "resume", ctr.ID()) +} -- cgit v1.2.3-54-g00ecf