fix pipe in broken may cause shim lock forever for runtime v1

lifubang · lifubang · commit e76a8879eb10 · 2018-11-19T09:25:43.000+08:00
Signed-off-by: Lifubang &lt;lifubang@acmcoder.com&gt;
diff --git a/runtime/v1/shim/service_linux.go b/runtime/v1/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)
 		}()
 	}
 
diff --git a/runtime/v2/runc/service_linux.go b/runtime/v2/runc/service_linux.go
@@ -52,6 +52,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
 			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)
 		}()
 	}

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console`
`52`	`52`	`bp := bufPool.Get().(*[]byte)`
`53`	`53`	`defer bufPool.Put(bp)`
`54`	`54`	`io.CopyBuffer(epollConsole, in, *bp)`
	`55`	`+ // we need to shutdown epollConsole when pipe broken`
`55`	`56`	`epollConsole.Shutdown(p.epoller.CloseConsole)`
`56`	`57`	`}()`
`57`	`58`	`}`