test(scaletest/workspacetraffic): fix test flake due to io.EOF on close (#21231)

mafredri · web-flow · commit 498c565fc70c · 2025-12-12T11:36:16.000Z
Fixes coder/internal#119
diff --git a/scaletest/workspacetraffic/conn.go b/scaletest/workspacetraffic/conn.go
@@ -147,8 +147,9 @@ func connectSSH(ctx context.Context, client *codersdk.Client, agentID uuid.UUID,
 	var closers []func() error
 	defer func() {
 		if err != nil {
-			for _, c := range closers {
-				if err2 := c(); err2 != nil {
+			// Reverse order, like defer.
+			for i := len(closers) - 1; i >= 0; i-- {
+				if err2 := closers[i](); err2 != nil {
 					err = errors.Join(err, err2)
 				}
 			}
@@ -227,8 +228,9 @@ func connectSSH(ctx context.Context, client *codersdk.Client, agentID uuid.UUID,
 				}
 			}
 		}
-		for _, c := range closers {
-			if err := c(); err != nil {
+		// Reverse order, like defer.
+		for i := len(closers) - 1; i >= 0; i-- {
+			if err := closers[i](); err != nil {
 				if !errors.Is(err, io.EOF) {
 					merr = errors.Join(merr, err)
 				}
diff --git a/scaletest/workspacetraffic/run.go b/scaletest/workspacetraffic/run.go
@@ -3,6 +3,7 @@ package workspacetraffic
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"math/rand"
@@ -131,8 +132,11 @@ func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) (err error)
 	closeConn := func() error {
 		closeOnce.Do(func() {
 			closeErr = conn.Close()
-			if closeErr != nil {
+			if errors.Is(closeErr, io.EOF) {
+				closeErr = nil
+			} else if closeErr != nil {
 				logger.Error(ctx, "close agent connection", slog.Error(closeErr))
+				closeErr = xerrors.Errorf("close agent connection: %w", closeErr)
 			}
 		})
 		return closeErr

Original file line number	Diff line number	Diff line change
`@@ -147,8 +147,9 @@ func connectSSH(ctx context.Context, client *codersdk.Client, agentID uuid.UUID,`
`147`	`147`	`var closers []func() error`
`148`	`148`	`defer func() {`
`149`	`149`	`if err != nil {`
`150`		`- for _, c := range closers {`
`151`		`- if err2 := c(); err2 != nil {`
	`150`	`+ // Reverse order, like defer.`
	`151`	`+ for i := len(closers) - 1; i >= 0; i-- {`
	`152`	`+ if err2 := closers[i](); err2 != nil {`
`152`	`153`	`err = errors.Join(err, err2)`
`153`	`154`	`}`
`154`	`155`	`}`
`@@ -227,8 +228,9 @@ func connectSSH(ctx context.Context, client *codersdk.Client, agentID uuid.UUID,`
`227`	`228`	`}`
`228`	`229`	`}`
`229`	`230`	`}`
`230`		`- for _, c := range closers {`
`231`		`- if err := c(); err != nil {`
	`231`	`+ // Reverse order, like defer.`
	`232`	`+ for i := len(closers) - 1; i >= 0; i-- {`
	`233`	`+ if err := closers[i](); err != nil {`
`232`	`234`	`if !errors.Is(err, io.EOF) {`
`233`	`235`	`merr = errors.Join(merr, err)`
`234`	`236`	`}`