https-github-com-bit
diff --git a/‎archive/tar_windows.go‎
Lines changed: 6 additions & 3 deletions b/‎archive/tar_windows.go‎
Lines changed: 6 additions & 3 deletions
@@ -35,7 +35,6 @@ import (
 
 	"github.com/Microsoft/go-winio"
 	"github.com/Microsoft/hcsshim"
-	"github.com/containerd/containerd/log"
 	"github.com/containerd/containerd/sys"
 )
 
@@ -180,8 +179,12 @@ func applyWindowsLayer(ctx context.Context, root string, tr *tar.Reader, options
 		return 0, err
 	}
 	defer func() {
-		if err := w.Close(); err != nil {
-			log.G(ctx).Errorf("failed to close layer writer: %v", err)
+		if err2 := w.Close(); err2 != nil {
+			// This error should not be discarded as a failure here
+			// could result in an invalid layer on disk
+			if err == nil {
+				err = err2
+			}
 		}
 	}()
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ import (`
`35`	`35`
`36`	`36`	`"github.com/Microsoft/go-winio"`
`37`	`37`	`"github.com/Microsoft/hcsshim"`
`38`		`- "github.com/containerd/containerd/log"`
`39`	`38`	`"github.com/containerd/containerd/sys"`
`40`	`39`	`)`
`41`	`40`
`@@ -180,8 +179,12 @@ func applyWindowsLayer(ctx context.Context, root string, tr *tar.Reader, options`
`180`	`179`	`return 0, err`
`181`	`180`	`}`
`182`	`181`	`defer func() {`
`183`		`- if err := w.Close(); err != nil {`
`184`		`- log.G(ctx).Errorf("failed to close layer writer: %v", err)`
	`182`	`+ if err2 := w.Close(); err2 != nil {`
	`183`	`+ // This error should not be discarded as a failure here`
	`184`	`+ // could result in an invalid layer on disk`
	`185`	`+ if err == nil {`
	`186`	`+ err = err2`
	`187`	`+ }`
`185`	`188`	`}`
`186`	`189`	`}()`
`187`	`190`