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

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

Browse Source 
Signed-off-by: Lifubang <lifubang@acmcoder.com>
This commit is contained in:
Lifubang 2018-11-19 09:04:00 +08:00
parent b3438f7a6f
commit e76a8879eb
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/v1/shim/service_linux.go
View File

@ -49,9 +49,11 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
cwg.Add(1) cwg.Add(1)
go func() { go func() {
cwg.Done() cwg.Done()
p := bufPool.Get().(*[]byte) bp := bufPool.Get().(*[]byte)
defer bufPool.Put(p) defer bufPool.Put(bp)
io.CopyBuffer(epollConsole, in, *p) io.CopyBuffer(epollConsole, in, *bp)
// we need to shutdown epollConsole when pipe broken
epollConsole.Shutdown(p.epoller.CloseConsole)
}() }()
} }

1
runtime/v2/runc/service_linux.go
View File

@ -52,6 +52,7 @@ func (p *linuxPlatform) CopyConsole(ctx context.Context, console console.Console
bp := bufPool.Get().(*[]byte) bp := bufPool.Get().(*[]byte)
defer bufPool.Put(bp) defer bufPool.Put(bp)
io.CopyBuffer(epollConsole, in, *bp) io.CopyBuffer(epollConsole, in, *bp)
// we need to shutdown epollConsole when pipe broken
epollConsole.Shutdown(p.epoller.CloseConsole) epollConsole.Shutdown(p.epoller.CloseConsole)
}() }()
} }