Commit365231b

authored

fix(cli): scaletest: ignore errors syncing output (#13076)

1 parent74f2771 commit365231bCopy full SHA for 365231b

File tree

-9

lines changed

-9

lines changed

Lines changed: 2 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"strconv"`
`15`	`15`	`"strings"`
`16`	`16`	`"sync"`
`17`		`-"syscall"`
`18`	`17`	`"time"`
`19`	`18`
`20`	`19`	`"github.com/google/uuid"`
`@@ -245,14 +244,8 @@ func (o *scaleTestOutput) write(res harness.Results, stdout io.Writer) error {`
`245`	`244`
`246`	`245`	`// Sync the file to disk if it's a file.`
`247`	`246`	`ifs,ok:=w.(interface{Sync()error });ok {`
`248`		`-err:=s.Sync()`
`249`		`-// On Linux, EINVAL is returned when calling fsync on /dev/stdout. We`
`250`		`-// can safely ignore this error.`
`251`		`-// On macOS, ENOTTY is returned when calling sync on /dev/stdout. We`
`252`		`-// can safely ignore this error.`
`253`		`-iferr!=nil&&!xerrors.Is(err,syscall.EINVAL)&&!xerrors.Is(err,syscall.ENOTTY) {`
`254`		`-returnxerrors.Errorf("flush output file: %w",err)`
`255`		`-}`
	`247`	`+// Best effort. If we get an error from syncing, just ignore it.`
	`248`	`+_=s.Sync()`
`256`	`249`	`}`
`257`	`250`
`258`	`251`	`ifc!=nil {`

Comments

(0)