containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not recreate containers in runc after restart 

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
This commit is contained in:
Matthew Heon 2017-12-06 11:15:17 -05:00
parent ceb7fb1c60
commit b66287689a
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libpod/container.go
View File

@ -428,23 +428,11 @@ func (c *Container) refresh() error {
c.state.Mounted = false c.state.Mounted = false
c.state.Mountpoint = "" c.state.Mountpoint = ""
// The container is no longe running // The container is no longer running
c.state.PID = 0 c.state.PID = 0
// Check the container's state. If it's not created in runc yet, we're // The container no longer exists in runc
// done c.state.State = ContainerStateConfigured
if c.state.State == ContainerStateConfigured {
if err := c.runtime.state.SaveContainer(c); err != nil {
return errors.Wrapf(err, "error refreshing state for container %s", c.ID())
}
return nil
}
// The container must be recreated in runc
if err := c.init(); err != nil {
return err
}
if err := c.runtime.state.SaveContainer(c); err != nil { if err := c.runtime.state.SaveContainer(c); err != nil {
return errors.Wrapf(err, "error refreshing state for container %s", c.ID()) return errors.Wrapf(err, "error refreshing state for container %s", c.ID())
@ -454,7 +442,7 @@ func (c *Container) refresh() error {
} }
// Init creates a container in the OCI runtime // Init creates a container in the OCI runtime
func (c *Container) Init() error { func (c *Container) Init() (err error) {
c.lock.Lock() c.lock.Lock()
defer c.lock.Unlock() defer c.lock.Unlock()
@ -466,12 +454,6 @@ func (c *Container) Init() error {
return errors.Wrapf(ErrCtrExists, "container %s has already been created in runtime", c.ID()) return errors.Wrapf(ErrCtrExists, "container %s has already been created in runtime", c.ID())
} }
return c.init()
}
// Creates container in OCI runtime
// Internal only - does not lock or check state
func (c *Container) init() (err error) {
if err := c.mountStorage(); err != nil { if err := c.mountStorage(); err != nil {
return err return err
} }