diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-03-25 15:33:52 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-03-25 15:33:52 -0400 |
| commit | 1313f8a4504000e43512810937701347bf252cfc (patch) | |
| tree | 2c3bce783ac4416c03934d4c5a96e5b055cfa6fc /libpod/oci_conmon_linux.go | |
| parent | ff0124aee1ca700be3b7357b992a220cdacfddfd (diff) | |
| download | podman-1313f8a4504000e43512810937701347bf252cfc.tar.gz podman-1313f8a4504000e43512810937701347bf252cfc.tar.bz2 podman-1313f8a4504000e43512810937701347bf252cfc.zip | |
Ensure that exec sends resize events
We previously tried to send resize events only after the exec
session successfully started, which makes sense (we might drop an
event or two that came in before the exec session started
otherwise). However, the start function blocks, so waiting
actually means we send no resize events at all, which is
obviously worse than losing a few.. Sending resizes before attach
starts seems to work fine in my testing, so let's do that until we
get bug reports that it doesn't work.
Fixes #5584
Signed-off-by: Matthew Heon <mheon@redhat.com>
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 82c5d7020..6d9a976cb 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -793,7 +793,6 @@ func (r *ConmonOCIRuntime) ExecAttachResize(ctr *Container, sessionID string, ne } defer controlFile.Close() - logrus.Debugf("Received a resize event for container %s exec session %s: %+v", ctr.ID(), sessionID, newSize) if _, err = fmt.Fprintf(controlFile, "%d %d %d\n", 1, newSize.Height, newSize.Width); err != nil { return errors.Wrapf(err, "failed to write to ctl file to resize terminal") } |