copierWithSubprocess(): try to capture stderr on io.ErrClosedPipe

When we get a tried-to-write-to-closed-pipe error while encoding something for a coprocess, try to capture error output from the coprocess and add it to the error message, to hopefully catch a flake we're seeing in CI. Signed-off-by: Nalin Dahyabhai <[email protected]>
containers · May 10, 2024 · 1a06b7e · 1a06b7e
1 parent fbf4511
commit 1a06b7e
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/copier/copier.go b/copier/copier.go
@@ -18,6 +18,7 @@ import (
 	"sync"
 	"syscall"
 	"time"
+	"unicode"
 
 	"github.com/containers/image/v5/pkg/compression"
 	"github.com/containers/storage/pkg/archive"
@@ -633,6 +634,14 @@ func copierWithSubprocess(bulkReader io.Reader, bulkWriter io.Writer, req reques
 		if err2 := cmd.Process.Kill(); err2 != nil {
 			return nil, fmt.Errorf("killing subprocess: %v; %s: %w", err2, step, err)
 		}
+		if errors.Is(err, io.ErrClosedPipe) || errors.Is(err, syscall.EPIPE) {
+			if err2 := cmd.Wait(); err2 != nil {
+				return nil, fmt.Errorf("waiting on subprocess: %v; %s: %w", err2, step, err)
+			}
+			if errorText := strings.TrimFunc(errorBuffer.String(), unicode.IsSpace); errorText != "" {
+				err = fmt.Errorf("%s: %w", errorText, err)
+			}
+		}
 		return nil, fmt.Errorf("%v: %w", step, err)
 	}
 	if err = encoder.Encode(req); err != nil {