mirror of
https://github.com/containers/podman.git
synced 2025-10-18 03:33:32 +08:00
Enable cleanup processes for detached exec
The cleanup command creation logic is made public as part of this and wired such that we can call it both within SpecGen (to make container exit commands) and from the ABI detached exec handler. Exit commands are presently only used for detached exec, but theoretically could be turned on for all exec sessions if we wanted (I'm declining to do this because of potential overhead). I also forgot to copy the exit command from the exec config into the ExecOptions struct used by the OCI runtime, so it was not being added. There are also two significant bugfixes for exec in here. One is for updating the status of running exec sessions - this was always failing as I had coded it to remove the exit file *before* reading it, instead of after (oops). The second was that removing a running exec session would always fail because I inverted the check to see if it was running. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
@ -390,6 +390,8 @@ func (r *Runtime) removeContainer(ctx context.Context, c *Container, force bool,
|
||||
}
|
||||
}
|
||||
|
||||
logrus.Debugf("Removing container %s", c.ID())
|
||||
|
||||
// We need to lock the pod before we lock the container.
|
||||
// To avoid races around removing a container and the pod it is in.
|
||||
// Don't need to do this in pod removal case - we're evicting the entire
|
||||
|
Reference in New Issue
Block a user