TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-22 12:58:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ipn/ipnlocal: remove locks around sync.Cond.Broadcast call"

Browse Source 
Reason for revert: Causes ipnlocal tests to deadlock intermittently.

This reverts commit 1b15349e011a14a54e1a0b0f613df47bb2898d6f.

Signed-off-by: Josh Bleecher Snyder <josh@tailscale.com>
This commit is contained in:
Josh Bleecher Snyder 2021-09-16 12:56:43 -07:00 committed by Josh Bleecher Snyder
parent a05086ef86
commit b7ede14396
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ipn/ipnlocal/local.go
View File

@ -601,12 +601,18 @@ func (b *LocalBackend) findExitNodeIDLocked(nm *netmap.NetworkMap) (prefsChanged
func (b *LocalBackend) setWgengineStatus(s *wgengine.Status, err error) { func (b *LocalBackend) setWgengineStatus(s *wgengine.Status, err error) {
if err != nil { if err != nil {
b.logf("wgengine status error: %v", err) b.logf("wgengine status error: %v", err)
b.statusLock.Lock()
b.statusChanged.Broadcast() b.statusChanged.Broadcast()
b.statusLock.Unlock()
return return
} }
if s == nil { if s == nil {
b.logf("[unexpected] non-error wgengine update with status=nil: %v", s) b.logf("[unexpected] non-error wgengine update with status=nil: %v", s)
b.statusLock.Lock()
b.statusChanged.Broadcast() b.statusChanged.Broadcast()
b.statusLock.Unlock()
return return
} }
@ -626,7 +632,11 @@ func (b *LocalBackend) setWgengineStatus(s *wgengine.Status, err error) {
} }
b.stateMachine() b.stateMachine()
} }
b.statusLock.Lock()
b.statusChanged.Broadcast() b.statusChanged.Broadcast()
b.statusLock.Unlock()
b.send(ipn.Notify{Engine: &es}) b.send(ipn.Notify{Engine: &es})
} }