Commita787861

authored

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

1 parent5304b4e commita787861Copy full SHA for a787861

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 3 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,11 +45,12 @@ func NewRunner(client codersdk.Client, cfg Config) Runner {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// Run implements Runnable.`
`48`		`-func (r*Runner)Run(ctx context.Context,_string,logs io.Writer)error {`
	`48`	`+func (r*Runner)Run(ctx context.Context,_string,w io.Writer)error {`
`49`	`49`	`ctx,span:=tracing.StartSpan(ctx)`
`50`	`50`	`deferspan.End()`
`51`	`51`
`52`		`-logs=loadtestutil.NewSyncWriter(logs)`
	`52`	`+logs:=loadtestutil.NewSyncWriter(w)`
	`53`	`+deferlogs.Close()`
`53`	`54`	`logger:=slog.Make(sloghuman.Sink(logs)).Leveled(slog.LevelDebug)`
`54`	`55`	`r.client.Logger=logger`
`55`	`56`	`r.client.LogBodies=true`

Lines changed: 13 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,9 @@ import (`
`7`	`7`
`8`	`8`	`// SyncWriter wraps an io.Writer in a sync.Mutex.`
`9`	`9`	`typeSyncWriterstruct {`
`10`		`-mut*sync.Mutex`
`11`		`-w io.Writer`
	`10`	`+mut*sync.Mutex`
	`11`	`+w io.Writer`
	`12`	`+closedbool`
`12`	`13`	`}`
`13`	`14`
`14`	`15`	`funcNewSyncWriter(w io.Writer)*SyncWriter {`
`@@ -22,5 +23,15 @@ func NewSyncWriter(w io.Writer) *SyncWriter {`
`22`	`23`	`func (sw*SyncWriter)Write(p []byte) (nint,errerror) {`
`23`	`24`	`sw.mut.Lock()`
`24`	`25`	`defersw.mut.Unlock()`
	`26`	`+ifsw.closed {`
	`27`	`+return-1,io.ErrClosedPipe`
	`28`	`+}`
`25`	`29`	`returnsw.w.Write(p)`
`26`	`30`	`}`
	`31`	`+`
	`32`	`+func (sw*SyncWriter)Close()error {`
	`33`	`+sw.mut.Lock()`
	`34`	`+defersw.mut.Unlock()`
	`35`	`+sw.closed=true`
	`36`	`+returnnil`
	`37`	`+}`

Comments

(0)