vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Merge pull request #21840 from tonistiigi/fix-closing-attach-streams

Browse source 
Fix closing attach streams on lost tcp connection
This commit is contained in:
Brian Goff 2016-04-07 12:02:33 -04:00
commit f0c9045a2d
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ioutils/bytespipe.go
View file

@ -51,6 +51,7 @@ func (bp *BytesPipe) Write(p []byte) (int, error) {
bp.mu.Lock() bp.mu.Lock()
written := 0 written := 0
loop0:
for { for {
if bp.closeErr != nil { if bp.closeErr != nil {
bp.mu.Unlock() bp.mu.Unlock()
@ -85,6 +86,9 @@ func (bp *BytesPipe) Write(p []byte) (int, error) {
// make sure the buffer doesn't grow too big from this write // make sure the buffer doesn't grow too big from this write
for bp.bufLen >= blockThreshold { for bp.bufLen >= blockThreshold {
bp.wait.Wait() bp.wait.Wait()
if bp.closeErr != nil {
continue loop0
}
} }
// add new byte slice to the buffers slice and continue writing // add new byte slice to the buffers slice and continue writing