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

Merge pull request #2910 from jterry75/shim_shutdown_error_log

Browse Source 
Fix spurious ttrpc client shutdown error log on success
This commit is contained in:
Michael Crosby 2019-01-07 11:54:07 -05:00 committed by GitHub
commit 30003c4439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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.go
View File

@ -112,7 +112,7 @@ func (s *shim) Shutdown(ctx context.Context) error {
_, err := s.task.Shutdown(ctx, &task.ShutdownRequest{ _, err := s.task.Shutdown(ctx, &task.ShutdownRequest{
ID: s.ID(), ID: s.ID(),
}) })
if err != nil && err != ttrpc.ErrClosed { if err != nil && errors.Cause(err) != ttrpc.ErrClosed {
return errdefs.FromGRPC(err) return errdefs.FromGRPC(err)
} }
return nil return nil