NotificationsYou must be signed in to change notification settings
Fork1k
Star11.2k

Commitba7d183

authored

fix: fix flake in TestWorkspaceAgent_Metadata_CatchMemoryLeak (#13553)

Fixes flake seen here:https://github.com/coder/coder/actions/runs/9461246505/job/26061605278 #13486 subtly changes the test so that `post` uses the new v2 Agent API, and when canceling context, there is a race condition where the yamux session underpinning the API can get torn down before the RPC processes the canceled context, yielding a different error response than the test was previously expecting.I've refactored the test to just stop posting when the test finishes, rather than depend on a context cancel to end the posting goroutine.

1 parent0c627a4 commitba7d183Copy full SHA for ba7d183

File tree

1 file changed

+11

-15

lines changed

coderd
- workspaceagents_test.go

1 file changed

+11

-15

lines changed

`‎coderd/workspaceagents_test.go‎`

Lines changed: 11 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -1350,7 +1350,7 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) {`
`1350`	`1350`	`agentClient:=agentsdk.New(client.URL)`
`1351`	`1351`	`agentClient.SetSessionToken(r.AgentToken)`
`1352`	`1352`
`1353`		`-ctx,cancel:=context.WithCancel(testutil.Context(t,testutil.WaitSuperLong))`
	`1353`	`+ctx:=testutil.Context(t,testutil.WaitSuperLong)`
`1354`	`1354`	`conn,err:=agentClient.ConnectRPC(ctx)`
`1355`	`1355`	`require.NoError(t,err)`
`1356`	`1356`	`deferfunc() {`
`@@ -1404,20 +1404,21 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) {`
`1404`	`1404`
`1405`	`1405`	`postDone:=testutil.Go(t,func() {`
`1406`	`1406`	`for {`
	`1407`	`+select {`
	`1408`	`+case<-metadataDone:`
	`1409`	`+return`
	`1410`	`+default:`
	`1411`	`+}`
`1407`	`1412`	`// We need to send two separate metadata updates to trigger the`
`1408`	`1413`	`// memory leak. foo2 will cause the number of foo1 to be doubled, etc.`
`1409`		`-err=post(ctx,"foo1","hi")`
	`1414`	`+err:=post(ctx,"foo1","hi")`
`1410`	`1415`	`iferr!=nil {`
`1411`		`-if!xerrors.Is(err,context.Canceled) {`
`1412`		`-assert.NoError(t,err,"post metadata foo1")`
`1413`		`-}`
	`1416`	`+assert.NoError(t,err,"post metadata foo1")`
`1414`	`1417`	`return`
`1415`	`1418`	`}`
`1416`	`1419`	`err=post(ctx,"foo2","bye")`
`1417`	`1420`	`iferr!=nil {`
`1418`		`-if!xerrors.Is(err,context.Canceled) {`
`1419`		`-assert.NoError(t,err,"post metadata foo1")`
`1420`		`-}`
	`1421`	`+assert.NoError(t,err,"post metadata foo1")`
`1421`	`1422`	`return`
`1422`	`1423`	`}`
`1423`	`1424`	`}`
`@@ -1436,13 +1437,8 @@ func TestWorkspaceAgent_Metadata_CatchMemoryLeak(t *testing.T) {`
`1436`	`1437`	`// testing it is not straightforward.`
`1437`	`1438`	`db.err.Store(&wantErr)`
`1438`	`1439`
`1439`		`-select {`
`1440`		`-case<-ctx.Done():`
`1441`		`-t.Fatal("timeout waiting for SSE to close")`
`1442`		`-case<-metadataDone:`
`1443`		`-}`
`1444`		`-cancel()`
`1445`		`-<-postDone`
	`1440`	`+testutil.RequireRecvCtx(ctx,t,metadataDone)`
	`1441`	`+testutil.RequireRecvCtx(ctx,t,postDone)`
`1446`	`1442`	`}`
`1447`	`1443`
`1448`	`1444`	`funcTestWorkspaceAgent_Startup(t*testing.T) {`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitba7d183

File tree

1 file changed

1 file changed

`‎coderd/workspaceagents_test.go‎`

0 commit comments