mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-03 00:11:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/magicsock: unblock Conn.Synchronize on Conn.Close

Browse Source 
I noticed a deadlock in a test in a in-development PR where during a
shutdown storm of things (from a tsnet.Server.Close), LocalBackend was
trying to call magicsock.Conn.Synchronize but the magicsock and/or
eventbus was already shut down and no longer processing events.

Updates #16369

Change-Id: I58b1f86c8959303c3fb46e2e3b7f38f6385036f1
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2025-11-10 16:51:46 -08:00 committed by Brad Fitzpatrick
parent 2ad2d4d409
commit 42ce5c88be
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wgengine/magicsock/magicsock.go
View File

@ -665,7 +665,10 @@ func (c *Conn) Synchronize() {
} }
sp := syncPoint(make(chan struct{})) sp := syncPoint(make(chan struct{}))
c.syncPub.Publish(sp) c.syncPub.Publish(sp)
sp.Wait() select {
case <-sp:
case <-c.donec:
}
} }
// NewConn creates a magic Conn listening on opts.Port. // NewConn creates a magic Conn listening on opts.Port.