fixup! drain connection async

johnstcn · johnstcn · commit 2f8cb85b5092 · 2023-05-03T11:31:49.000+01:00
diff --git a/scaletest/trafficgen/run.go b/scaletest/trafficgen/run.go
@@ -116,17 +116,14 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) error {
 	if wErr := <-wch; wErr != nil {
 		return xerrors.Errorf("write to pty: %w", wErr)
 	}
-	drainStart := time.Now()
 	if rErr := <-rch; rErr != nil {
 		return xerrors.Errorf("read from pty: %w", rErr)
 	}
 
 	duration := time.Since(start)
-	drainDuration := time.Since(drainStart)
 
 	logger.Info(ctx, "results",
 		slog.F("duration", duration),
-		slog.F("drain", drainDuration),
 		slog.F("sent", crw.BytesWritten()),
 		slog.F("rcvd", crw.BytesRead()),
 	)

Original file line number	Diff line number	Diff line change
`@@ -116,17 +116,14 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) error {`
`116`	`116`	`if wErr := <-wch; wErr != nil {`
`117`	`117`	`return xerrors.Errorf("write to pty: %w", wErr)`
`118`	`118`	`}`
`119`		`- drainStart := time.Now()`
`120`	`119`	`if rErr := <-rch; rErr != nil {`
`121`	`120`	`return xerrors.Errorf("read from pty: %w", rErr)`
`122`	`121`	`}`
`123`	`122`
`124`	`123`	`duration := time.Since(start)`
`125`		`- drainDuration := time.Since(drainStart)`
`126`	`124`
`127`	`125`	`logger.Info(ctx, "results",`
`128`	`126`	`slog.F("duration", duration),`
`129`		`- slog.F("drain", drainDuration),`
`130`	`127`	`slog.F("sent", crw.BytesWritten()),`
`131`	`128`	`slog.F("rcvd", crw.BytesRead()),`
`132`	`129`	`)`