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

Commitb5fbfd7

authored

fix: fix hang in teardown of TestConn_CoordinatorRollingRestart (#15624)

fixes a flake seen on main:https://github.com/coder/coder/actions/runs/11967210463/job/33364072261the TCP echo server had a waitgroup to ensure that all accepted connections get torn down, but no explicit teardown of the connection. We depended on the tailnet agent closing its side of the connection, which depends on closing the tunneled connection. The tunneled `FIN` could race with tearing down the tunnel itself.So, this PR adds explicit `t.Cleanup` to close the echo connection. It also removes the waitgroup. The purpose of the waitgroup was to ensure that all goroutines created by the echo listener get shut down, but we have `goleak` for that, which fails much faster than the 20 minutes this test run took.

1 parent103824f commitb5fbfd7Copy full SHA for b5fbfd7

File tree

1 file changed

-7

lines changed

enterprise/coderd
- coderd_test.go

1 file changed

-7

lines changed

`‎enterprise/coderd/coderd_test.go‎`

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -852,30 +852,26 @@ func TestConn_CoordinatorRollingRestart(t *testing.T) {`
`852`	`852`	`}`
`853`	`853`
`854`	`854`	`functcpEchoServer(t*testing.T)string {`
`855`		`-varlistenerWg sync.WaitGroup`
`856`	`855`	`tcpListener,err:=net.Listen("tcp","127.0.0.1:0")`
`857`	`856`	`require.NoError(t,err)`
`858`	`857`	`t.Cleanup(func() {`
`859`	`858`	`_=tcpListener.Close()`
`860`		`-listenerWg.Wait()`
`861`	`859`	`})`
`862`		`-listenerWg.Add(1)`
`863`	`860`	`gofunc() {`
`864`		`-deferlistenerWg.Done()`
`865`	`861`	`for {`
`866`	`862`	`conn,err:=tcpListener.Accept()`
`867`	`863`	`iferr!=nil {`
`868`	`864`	`return`
`869`	`865`	`}`
`870`		`-listenerWg.Add(1)`
	`866`	`+t.Cleanup(func() {`
	`867`	`+_=conn.Close()`
	`868`	`+})`
`871`	`869`	`gofunc() {`
`872`		`-deferlistenerWg.Done()`
`873`	`870`	`deferconn.Close()`
`874`	`871`	`_,_=io.Copy(conn,conn)`
`875`	`872`	`}()`
`876`	`873`	`}`
`877`	`874`	`}()`
`878`		`-`
`879`	`875`	`returntcpListener.Addr().String()`
`880`	`876`	`}`
`881`	`877`

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!

Commitb5fbfd7

File tree

1 file changed

1 file changed

`‎enterprise/coderd/coderd_test.go‎`

0 commit comments