github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Revert part of 06dc87ae59

Browse Source 
Fixes #1389

This reverts waiting on stdin to finish its IO copy before returning
out.

This was causing `ctr` to block for every container start/exit.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-08-18 09:58:47 -04:00
parent b2ee0ab34e
commit cc3b7a5e9a
1 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io_unix.go
View File

@ -54,12 +54,10 @@ func copyIO(fifos *FIFOSet, ioset *ioSet, tty bool) (_ *wgCloser, err error) {
} }
set = append(set, f) set = append(set, f)
cwg.Add(1) cwg.Add(1)
wg.Add(1)
go func(w io.WriteCloser) { go func(w io.WriteCloser) {
cwg.Done() cwg.Done()
io.Copy(w, ioset.in) io.Copy(w, ioset.in)
w.Close() w.Close()
wg.Done()
}(f) }(f)
if f, err = fifo.OpenFifo(ctx, fifos.Out, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil { if f, err = fifo.OpenFifo(ctx, fifos.Out, syscall.O_RDONLY|syscall.O_CREAT|syscall.O_NONBLOCK, 0700); err != nil {