Skip to content

chore: resolve race when running load tests with logs #6523

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
merged 1 commit into from
Mar 9, 2023
Merged

chore: resolve race when running load tests with logs #6523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions scaletest/agentconn/run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,12 @@ func NewRunner(client *codersdk.Client, cfg Config) *Runner {
}

// Run implements Runnable.
func (r *Runner) Run(ctx context.Context, _ string, logs io.Writer) error {
func (r *Runner) Run(ctx context.Context, _ string, w io.Writer) error {
ctx, span := tracing.StartSpan(ctx)
defer span.End()

logs = loadtestutil.NewSyncWriter(logs)
logs := loadtestutil.NewSyncWriter(w)
defer logs.Close()
logger := slog.Make(sloghuman.Sink(logs)).Leveled(slog.LevelDebug)
r.client.Logger = logger
r.client.LogBodies = true
Expand Down
15 changes: 13 additions & 2 deletions scaletest/loadtestutil/syncwriter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (

// SyncWriter wraps an io.Writer in a sync.Mutex.
type SyncWriter struct {
mut *sync.Mutex
w io.Writer
mut *sync.Mutex
w io.Writer
closed bool
}

func NewSyncWriter(w io.Writer) *SyncWriter {
Expand All @@ -22,5 +23,15 @@ func NewSyncWriter(w io.Writer) *SyncWriter {
func (sw *SyncWriter) Write(p []byte) (n int, err error) {
sw.mut.Lock()
defer sw.mut.Unlock()
if sw.closed {
return -1, io.ErrClosedPipe
}
return sw.w.Write(p)
}

func (sw *SyncWriter) Close() error {
sw.mut.Lock()
defer sw.mut.Unlock()
sw.closed = true
return nil
}