TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-11-15 02:05:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: deflake tests, Close deadlock again

Browse Source 
Better fix than 37903a9056

Fixes tailscale/corp#533
This commit is contained in:
Brad Fitzpatrick
2020-08-04 09:36:38 -07:00
parent c3467fbadb
commit bfcb0aa0be
2 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wgengine/magicsock/magicsock_test.go
View File

@@ -807,13 +807,17 @@ func testActiveDiscovery(t *testing.T, d *devices) {
// from DERP.
mustDirect := func(m1, m2 *magicStack) {
lastLog := time.Now().Add(-time.Minute)
for deadline := time.Now().Add(5 * time.Second); time.Now().Before(deadline); time.Sleep(10 * time.Millisecond) {
pst := m1.Status().Peer[m2.Public()]
if pst.CurAddr != "" {
logf("direct link %s->%s found with addr %s", m1, m2, pst.CurAddr)
return
}
logf("no direct path %s->%s yet, addrs %v", m1, m2, pst.Addrs)
if now := time.Now(); now.Sub(lastLog) > time.Second {
logf("no direct path %s->%s yet, addrs %v", m1, m2, pst.Addrs)
lastLog = now
}
}
t.Errorf("magicsock did not find a direct path from %s to %s", m1, m2)
}