Apr 26, 2024 · Apr 25, 2024
diff --git a/cli/exp_scaletest.go b/cli/exp_scaletest.go
 "strconv"
 "strings"
 "sync"
 "syscall"
 "time"

 "github.com/google/uuid"

 // Sync the file to disk if it's a file.
 if s, ok := w.(interface{ Sync() error }); ok {
 err := s.Sync()
 // On Linux, EINVAL is returned when calling fsync on /dev/stdout. We
 // can safely ignore this error.
 // On macOS, ENOTTY is returned when calling sync on /dev/stdout. We
 // can safely ignore this error.
 if err != nil && !xerrors.Is(err, syscall.EINVAL) && !xerrors.Is(err, syscall.ENOTTY) {
 return xerrors.Errorf("flush output file: %w", err)
 }
 // Best effort. If we get an error from syncing, just ignore it.
 _ = s.Sync()
 }

 if c != nil {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,7 +14,6 @@ import (
		"strconv"
		"strings"
		"sync"
		"syscall"
		"time"

		"github.com/google/uuid"
Expand DownExpand Up		@@ -245,14 +244,8 @@ func (o *scaleTestOutput) write(res harness.Results, stdout io.Writer) error {

		// Sync the file to disk if it's a file.
		if s, ok := w.(interface{ Sync() error }); ok {
		err := s.Sync()
		// On Linux, EINVAL is returned when calling fsync on /dev/stdout. We
		// can safely ignore this error.
		// On macOS, ENOTTY is returned when calling sync on /dev/stdout. We
		// can safely ignore this error.
		if err != nil && !xerrors.Is(err, syscall.EINVAL) && !xerrors.Is(err, syscall.ENOTTY) {
		return xerrors.Errorf("flush output file: %w", err)
		}
		// Best effort. If we get an error from syncing, just ignore it.
		_ = s.Sync()
		}

		if c != nil {
Expand Down