Merge pull request #2816 from thaJeztah/1.1_backport_shimlockwhenstdinclose

dmcgowan · web-flow · commit 943f15f3e24d · 2018-11-20T10:18:44.000-08:00
[release/1.1] fix pipe in broken may cause shim lock forever for runtime v1
diff --git a/linux/shim/service_linux.go b/linux/shim/service_linux.go
@@ -49,9 +49,11 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
 		cwg.Add(1)
 		go func() {
 			cwg.Done()
-			p := bufPool.Get().(*[]byte)
-			defer bufPool.Put(p)
-			io.CopyBuffer(epollConsole, in, *p)
+			bp := bufPool.Get().(*[]byte)
+			defer bufPool.Put(bp)
+			io.CopyBuffer(epollConsole, in, *bp)
+			// we need to shutdown epollConsole when pipe broken
+			epollConsole.Shutdown(p.epoller.CloseConsole)
 		}()
 	}
 
