opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 03:19:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5088 from mheon/begin_exec_rework

Browse Source 
Begin exec rework
This commit is contained in:
OpenShift Merge Robot
2020-03-19 22:09:40 +01:00
committed by GitHub
parent c1ff17acfa e89c6382ae
commit aa6c8c2e55
20 changed files with 1552 additions and 448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/runtime_ctr.go
View File

@ -463,11 +463,9 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
}
}
// Check that all of our exec sessions have finished
for _, session := range c.state.ExecSessions {
if err := c.ociRuntime.ExecStopContainer(c, session.ID, c.StopTimeout()); err != nil {
return errors.Wrapf(err, "error stopping exec session %s of container %s", session.ID, c.ID())
}
// Remove all active exec sessions
if err := c.removeAllExecSessions(); err != nil {
return err
}
// Check that no other containers depend on the container.
@ -484,9 +482,8 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
}
}
// Set ContainerStateRemoving and remove exec sessions
// Set ContainerStateRemoving
c.state.State = define.ContainerStateRemoving
c.state.ExecSessions = nil
if err := c.save(); err != nil {
return errors.Wrapf(err, "unable to set container %s removing state in database", c.ID())