Skip to content

fix: Improve closure of provisioner and agent tailnet dial #6199

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 7 commits into from
Feb 14, 2023
Merged

fix: Improve closure of provisioner and agent tailnet dial #6199

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aa9e8de
fix: Improve use of context in `websocket.NetConn` code paths
mafredri Feb 14, 2023
2fa36d2
Revert one change
mafredri Feb 14, 2023
e5cb6ac
Fix gen
mafredri Feb 14, 2023
64f6496
fix: Improve closure of provisioner and agent tailnet dial
mafredri Feb 14, 2023
f5a53db
fixup! fix: Improve closure of provisioner and agent tailnet dial
mafredri Feb 14, 2023
bf7e792
Fix test data race
mafredri Feb 14, 2023
1795f5d
Merge branch 'main' into mafredri/fix-provisioner-closures
mafredri Feb 14, 2023
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
Prev Previous commit
Next Next commit
Revert one change
  • Loading branch information
@mafredri
mafredri committed Feb 14, 2023
commit 2fa36d2dd05f9077eb420397cc1bcbe39bfaa360
4 changes: 1 addition & 3 deletions codersdk/workspaceagents.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,7 @@ func (c *Client) DialWorkspaceAgent(ctx context.Context, agentID uuid.UUID, opti
options.Logger.Debug(ctx, "failed to dial", slog.Error(err))
continue
}
ctx, wsNetConn := websocketNetConn(ctx, ws, websocket.MessageBinary)
defer wsNetConn.Close()
sendNode, errChan := tailnet.ServeCoordinator(wsNetConn, func(node []*tailnet.Node) error {
sendNode, errChan := tailnet.ServeCoordinator(websocket.NetConn(ctx, ws, websocket.MessageBinary), func(node []*tailnet.Node) error {
return conn.UpdateNodes(node)
})
conn.SetNodeCallback(sendNode)
Expand Down