Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mafredri merged 2 commits into from
Dec 12, 2025
+11 −5
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca88ad
test(scaletest/workspacetraffic): fix test flake due to io.EOF on close
mafredri Dec 11, 2025
9d5dd5a
reverse
mafredri Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions scaletest/workspacetraffic/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
Expand Down Expand Up @@ -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)
}
Expand Down
6 changes: 5 additions & 1 deletion scaletest/workspacetraffic/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package workspacetraffic
import (
"bytes"
"context"
"errors"
"fmt"
"io"
"math/rand"
Expand Down Expand Up @@ -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
Expand Down
Loading