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

Always spawn a cleanup process with exec 

We were previously only doing this for detached exec. I don't
know why we did that, but I don't see any reason not to extend it
to all exec sessions - it guarantees that we will always clean up
exec sessions, even if the original `podman exec` process died.

[NO TESTS NEEDED] because I don't really know how to test this
one.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2021-05-19 14:49:26 -04:00
parent 2aedcae026
commit 341e6a1628
2 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libpod/container_exec.go
View File

@ -761,6 +761,9 @@ func (c *Container) Exec(config *ExecConfig, streams *define.AttachStreams, resi
} }
exitCode := session.ExitCode exitCode := session.ExitCode
if err := c.ExecRemove(sessionID, false); err != nil { if err := c.ExecRemove(sessionID, false); err != nil {
if errors.Cause(err) == define.ErrNoSuchExecSession {
return exitCode, nil
}
return -1, err return -1, err
} }

36
pkg/domain/infra/abi/containers.go
View File

@ -595,7 +595,7 @@ func (ic *ContainerEngine) ContainerAttach(ctx context.Context, nameOrID string,
return nil return nil
} }
func makeExecConfig(options entities.ExecOptions) *libpod.ExecConfig { func makeExecConfig(options entities.ExecOptions, rt *libpod.Runtime) (*libpod.ExecConfig, error) {
execConfig := new(libpod.ExecConfig) execConfig := new(libpod.ExecConfig)
execConfig.Command = options.Cmd execConfig.Command = options.Cmd
execConfig.Terminal = options.Tty execConfig.Terminal = options.Tty
@ -607,7 +607,20 @@ func makeExecConfig(options entities.ExecOptions) *libpod.ExecConfig {
execConfig.PreserveFDs = options.PreserveFDs execConfig.PreserveFDs = options.PreserveFDs
execConfig.AttachStdin = options.Interactive execConfig.AttachStdin = options.Interactive
return execConfig // Make an exit command
storageConfig := rt.StorageConfig()
runtimeConfig, err := rt.GetConfig()
if err != nil {
return nil, errors.Wrapf(err, "error retrieving Libpod configuration to build exec exit command")
}
// TODO: Add some ability to toggle syslog
exitCommandArgs, err := generate.CreateExitCommandArgs(storageConfig, runtimeConfig, false, true, true)
if err != nil {
return nil, errors.Wrapf(err, "error constructing exit command for exec session")
}
execConfig.ExitCommand = exitCommandArgs
return execConfig, nil
} }
func checkExecPreserveFDs(options entities.ExecOptions) error { func checkExecPreserveFDs(options entities.ExecOptions) error {
@ -647,7 +660,10 @@ func (ic *ContainerEngine) ContainerExec(ctx context.Context, nameOrID string, o
} }
ctr := ctrs[0] ctr := ctrs[0]
execConfig := makeExecConfig(options) execConfig, err := makeExecConfig(options, ic.Libpod)
if err != nil {
return ec, err
}
ec, err = terminal.ExecAttachCtr(ctx, ctr, execConfig, &streams) ec, err = terminal.ExecAttachCtr(ctx, ctr, execConfig, &streams)
return define.TranslateExecErrorToExitCode(ec, err), err return define.TranslateExecErrorToExitCode(ec, err), err
@ -664,20 +680,10 @@ func (ic *ContainerEngine) ContainerExecDetached(ctx context.Context, nameOrID s
} }
ctr := ctrs[0] ctr := ctrs[0]
execConfig := makeExecConfig(options) execConfig, err := makeExecConfig(options, ic.Libpod)
// Make an exit command
storageConfig := ic.Libpod.StorageConfig()
runtimeConfig, err := ic.Libpod.GetConfig()
if err != nil { if err != nil {
return "", errors.Wrapf(err, "error retrieving Libpod configuration to build exec exit command") return "", err
} }
// TODO: Add some ability to toggle syslog
exitCommandArgs, err := generate.CreateExitCommandArgs(storageConfig, runtimeConfig, false, true, true)
if err != nil {
return "", errors.Wrapf(err, "error constructing exit command for exec session")
}
execConfig.ExitCommand = exitCommandArgs
// Create and start the exec session // Create and start the exec session
id, err := ctr.ExecCreate(execConfig) id, err := ctr.ExecCreate(execConfig)