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

Fix a bug in shim log on Windows that can cause 100% CPU utilization

Browse Source 
With the change to unified shims (ie: 1 shim per multiple tasks) the shimLog
on Windows for the 2nd-Nth worload containers will not have an associated
named pipe listener.

Due to a subtle bug in errors.Wrap passing a nil error we would unblock the
disconnected listener and return 0 byte successfull reads which would cause go
to continually read and cap the CPU.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
This commit is contained in:
Justin Terry (VM) 2019-02-27 16:51:52 -08:00
parent e72ad44427
commit 828f6eb842
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/v2/shim_windows.go
View File

@ -78,7 +78,7 @@ func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {
time.Second*10, time.Second*10,
) )
if conerr != nil { if conerr != nil {
dpc.conerr = errors.Wrap(err, "failed to connect to shim log") dpc.conerr = errors.Wrap(conerr, "failed to connect to shim log")
} }
dpc.c = c dpc.c = c
dpc.wg.Done() dpc.wg.Done()