diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2020-06-05 16:09:26 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2020-06-05 16:18:53 -0400 |
| commit | 1cc9731dfad9ec06ab162ce432c82ec4d675e60e (patch) | |
| tree | c082c765c3463f53d80b729de596266e5f24301f /pkg/domain/infra/tunnel | |
| parent | 723e8234393fba230961bc1214a73ba5d01bbfe1 (diff) | |
| download | podman-1cc9731dfad9ec06ab162ce432c82ec4d675e60e.tar.gz podman-1cc9731dfad9ec06ab162ce432c82ec4d675e60e.tar.bz2 podman-1cc9731dfad9ec06ab162ce432c82ec4d675e60e.zip | |
Add parallel operation to `podman stop`
This is the other command that benefits greatly from being run in
parallel, due to the potential 15-second timeout for containers
that ignore SIGTERM.
While we're at it, also clean up how stop timeout is set. This
needs to be an optional parameter, so that the value set when the
container is created with `--stop-timeout` will be respected.
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'pkg/domain/infra/tunnel')
| -rw-r--r-- | pkg/domain/infra/tunnel/containers.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go index 36b7bf535..1981055e2 100644 --- a/pkg/domain/infra/tunnel/containers.go +++ b/pkg/domain/infra/tunnel/containers.go @@ -100,7 +100,7 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin } for _, c := range ctrs { report := entities.StopReport{Id: c.ID} - if err = containers.Stop(ic.ClientCxt, c.ID, &options.Timeout); err != nil { + if err = containers.Stop(ic.ClientCxt, c.ID, options.Timeout); err != nil { // These first two are considered non-fatal under the right conditions if errors.Cause(err).Error() == define.ErrCtrStopped.Error() { logrus.Debugf("Container %s is already stopped", c.ID) |