Commit03a7d2f

authored

chore: fix servertailnet test flake (#10110)

1 parent2d2bea7 commit03a7d2fCopy full SHA for 03a7d2f

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -229,6 +229,10 @@ func (s *ServerTailnet) watchAgentUpdates() {`
`229`	`229`
`230`	`230`	`err:=s.conn.UpdateNodes(nodes,false)`
`231`	`231`	`iferr!=nil {`
	`232`	`+ifxerrors.Is(err,tailnet.ErrConnClosed) {`
	`233`	`+s.logger.Warn(context.Background(),"tailnet conn closed, exiting watchAgentUpdates",slog.Error(err))`
	`234`	`+return`
	`235`	`+}`
`232`	`236`	`s.logger.Error(context.Background(),"update node in server tailnet",slog.Error(err))`
`233`	`237`	`return`
`234`	`238`	`}`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ import (`
`47`	`47`	`"github.com/coder/coder/v2/cryptorand"`
`48`	`48`	`)`
`49`	`49`
	`50`	`+varErrConnClosed=xerrors.New("connection closed")`
	`51`	`+`
`50`	`52`	`const (`
`51`	`53`	`WorkspaceAgentSSHPort=1`
`52`	`54`	`WorkspaceAgentReconnectingPTYPort=2`
`@@ -496,7 +498,7 @@ func (c Conn) UpdateNodes(nodes []Node, replacePeers bool) error {`
`496`	`498`	`deferc.mutex.Unlock()`
`497`	`499`
`498`	`500`	`ifc.isClosed() {`
`499`		`-returnxerrors.New("connection closed")`
	`501`	`+returnErrConnClosed`
`500`	`502`	`}`
`501`	`503`
`502`	`504`	`status:=c.Status()`
`@@ -590,7 +592,7 @@ func (c *Conn) RemovePeer(selector PeerSelector) (deleted bool, err error) {`
`590`	`592`	`deferc.mutex.Unlock()`
`591`	`593`
`592`	`594`	`ifc.isClosed() {`
`593`		`-returnfalse,xerrors.New("connection closed")`
	`595`	`+returnfalse,ErrConnClosed`
`594`	`596`	`}`
`595`	`597`
`596`	`598`	`deleted=false`
`@@ -919,7 +921,7 @@ func (c *Conn) Listen(network, addr string) (net.Listener, error) {`
`919`	`921`	`c.mutex.Lock()`
`920`	`922`	`ifc.isClosed() {`
`921`	`923`	`c.mutex.Unlock()`
`922`		`-returnnil,xerrors.New("closed")`
	`924`	`+returnnil,ErrConnClosed`
`923`	`925`	`}`
`924`	`926`	`ifc.listeners==nil {`
`925`	`927`	`c.listeners=map[listenKey]*listener{}`

Comments

(0)