Skip to content

chore: copy forced derp websockets to fix flake #6475

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 1 commit into from
Mar 7, 2023
Merged

chore: copy forced derp websockets to fix flake #6475

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
chore: copy forced derp websockets to fix flake 
See: https://github.com/coder/coder/actions/runs/4350034299/jobs/7600478389
  • Loading branch information
@kylecarbs
kylecarbs committed Mar 7, 2023
commit e5cb7ffdd46ff13d051a86e4c472af970687d61a
6 changes: 4 additions & 2 deletions tailnet/conn.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,11 +657,13 @@ func (c *Conn) selfNode() *Node {
}
var preferredDERP int
var derpLatency map[string]float64
var derpForcedWebsocket map[int]string
derpForcedWebsocket := make(map[int]string, 0)
if c.lastNetInfo != nil {
preferredDERP = c.lastNetInfo.PreferredDERP
derpLatency = c.lastNetInfo.DERPLatency
derpForcedWebsocket = c.lastDERPForcedWebsockets
for k, v := range c.lastDERPForcedWebsockets {
derpForcedWebsocket[k] = v
}
}

node := &Node{
Expand Down