TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-30 12:42:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: log home DERP changes with latency

Browse Source 
This adds additional logging on DERP home changes to allow
better troubleshooting.

Updates tailscale/corp#18095

Signed-off-by: Tim Walters <tim@tailscale.com>
(cherry picked from commit 856ea2376b59df8f84f96119559d4273588a04ac)
This commit is contained in:
Tim Walters 2024-10-23 14:27:00 -05:00 committed by Andrea Gottardo
parent 5280738690
commit 0472936f56
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wgengine/magicsock/derp.go
View File

@ -158,10 +158,10 @@ func (c *Conn) maybeSetNearestDERP(report *netcheck.Report) (preferredDERP int)
} else { } else {
connectedToControl = c.health.GetInPollNetMap() connectedToControl = c.health.GetInPollNetMap()
} }
if !connectedToControl {
c.mu.Lock() c.mu.Lock()
myDerp := c.myDerp myDerp := c.myDerp
c.mu.Unlock() c.mu.Unlock()
if !connectedToControl {
if myDerp != 0 { if myDerp != 0 {
metricDERPHomeNoChangeNoControl.Add(1) metricDERPHomeNoChangeNoControl.Add(1)
return myDerp return myDerp
@ -178,6 +178,11 @@ func (c *Conn) maybeSetNearestDERP(report *netcheck.Report) (preferredDERP int)
// one. // one.
preferredDERP = c.pickDERPFallback() preferredDERP = c.pickDERPFallback()
} }
if preferredDERP != myDerp {
c.logf(
"magicsock: home DERP changing from derp-%d [%dms] to derp-%d [%dms]",
c.myDerp, report.RegionLatency[myDerp].Milliseconds(), preferredDERP, report.RegionLatency[preferredDERP].Milliseconds())
}
if !c.setNearestDERP(preferredDERP) { if !c.setNearestDERP(preferredDERP) {
preferredDERP = 0 preferredDERP = 0
} }