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

Merge pull request #3252 from jterry75/remove_log_connect_error

Browse Source 
Stop logging error on v2 multi shim log failure
This commit is contained in:
Derek McGowan 2019-05-03 17:03:49 -07:00 committed by GitHub
commit 82f2ac7ede
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
runtime/v2/binary.go
View File

@ -84,7 +84,12 @@ func (b *binary) Start(ctx context.Context) (_ *shim, err error) {
go func() {
defer f.Close()
if _, err := io.Copy(os.Stderr, f); err != nil {
log.G(ctx).WithError(err).Error("copy shim log")
// When using a multi-container shim the 2nd to Nth container in the
// shim will not have a seperate log pipe. Ignore the failure log
// message here when the shim connect times out.
if !os.IsNotExist(errors.Cause(err)) {
log.G(ctx).WithError(err).Error("copy shim log")
}
}
}()
out, err := cmd.CombinedOutput()

7
runtime/v2/shim.go
View File

@ -70,7 +70,12 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
go func() {
defer f.Close()
if _, err := io.Copy(os.Stderr, f); err != nil {
log.G(ctx).WithError(err).Error("copy shim log")
// When using a multi-container shim the 2nd to Nth container in the
// shim will not have a seperate log pipe. Ignore the failure log
// message here when the shim connect times out.
if !os.IsNotExist(errors.Cause(err)) {
log.G(ctx).WithError(err).Error("copy shim log")
}
}
}()