diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 10:54:33 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2021-03-26 15:15:17 -0400 |
| commit | dcabf6dd717ad495ba71d2788a64255defb852fd (patch) | |
| tree | bd2ee4042feadd0b84a2b4076b2d7e948f4855b7 /pkg/api/server | |
| parent | c81e273835303664d62c4e958a7f34877c05ed49 (diff) | |
| download | podman-dcabf6dd717ad495ba71d2788a64255defb852fd.tar.gz podman-dcabf6dd717ad495ba71d2788a64255defb852fd.tar.bz2 podman-dcabf6dd717ad495ba71d2788a64255defb852fd.zip | |
Remove resize race condition
Since podman-remote resize requests can come in at random times, this
generates a real potential for race conditions. We should only be
attempting to resize TTY on running containers, but the containers can
go from running to stopped at any time, and returning an error to the
caller is just causing noice.
This change will basically ignore requests to resize terminals if the
container is not running and return the caller to success. All other
callers will still return failure.
Fixes: https://github.com/containers/podman/issues/9831
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'pkg/api/server')
| -rw-r--r-- | pkg/api/server/register_containers.go | 5 | ||||
| -rw-r--r-- | pkg/api/server/register_exec.go | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/pkg/api/server/register_containers.go b/pkg/api/server/register_containers.go index 31196aa9e..b379d52ce 100644 --- a/pkg/api/server/register_containers.go +++ b/pkg/api/server/register_containers.go @@ -587,6 +587,11 @@ func (s *APIServer) registerContainersHandlers(r *mux.Router) error { // type: integer // required: false // description: Width to set for the terminal, in characters + // - in: query + // name: running + // type: boolean + // required: false + // description: Ignore containers not running errors // produces: // - application/json // responses: diff --git a/pkg/api/server/register_exec.go b/pkg/api/server/register_exec.go index 0f8c827c8..de437ab1a 100644 --- a/pkg/api/server/register_exec.go +++ b/pkg/api/server/register_exec.go @@ -136,6 +136,11 @@ func (s *APIServer) registerExecHandlers(r *mux.Router) error { // name: w // type: integer // description: Width of the TTY session in characters + // - in: query + // name: running + // type: boolean + // required: false + // description: Ignore containers not running errors // produces: // - application/json // responses: |