opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix podman hangs when detecting startup error in container attached mode

Browse Source 
Signed-off-by: Marco Vedovati <mvedovati@suse.com>

The initial resize command sent to the terminal window over the resize
channel may never be delivered in case of error.

Hence it is necessary to consume all data from the resize channel to
avoid a deadlock on startup.

Fixes: #1009

Closes: #1010
Approved by: giuseppe
This commit is contained in:
Marco Vedovati
2018-06-27 19:01:45 +02:00
committed by Atomic Bot
parent b5cd076164
commit 333ab8c211
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/podman/utils.go
View File

@ -46,6 +46,19 @@ func attachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detachKeys
defer restoreTerminal(oldTermState)
}
// There may be on the other size of the resize channel a goroutine trying to send.
// So consume all data inside the channel before exiting to avoid a deadlock.
defer func() {
for {
select {
case <-resize:
logrus.Debugf("Consumed resize command from channel")
default:
return
}
}
}()
streams := new(libpod.AttachStreams)
streams.OutputStream = stdout
streams.ErrorStream = stderr
@ -103,6 +116,19 @@ func startAttachCtr(ctr *libpod.Container, stdout, stderr, stdin *os.File, detac
defer restoreTerminal(oldTermState)
}
// There may be on the other size of the resize channel a goroutine trying to send.
// So consume all data inside the channel before exiting to avoid a deadlock.
defer func() {
for {
select {
case <-resize:
logrus.Debugf("Consumed resize command from channel")
default:
return
}
}
}()
streams := new(libpod.AttachStreams)
streams.OutputStream = stdout
streams.ErrorStream = stderr