mirror of
https://github.com/tailscale/tailscale.git
synced 2025-12-24 00:18:20 -05:00
feature/relayserver: fix Shutdown() deadlock (#17898)
Updates #17894
Signed-off-by: Jordan Whited <jordan@tailscale.com>
(cherry picked from commit 0285e1d5fb)
This commit is contained in:
committed by
Jordan Whited
parent
0f421d3def
commit
ea8eeeb2f7
@@ -246,10 +246,13 @@ func (e *extension) stopRelayServerLocked() {
|
||||
|
||||
// Shutdown implements [ipnlocal.Extension].
|
||||
func (e *extension) Shutdown() error {
|
||||
// [extension.mu] must not be held when closing the [eventbus.Client]. Close
|
||||
// blocks until all [eventbus.SubscribeFunc]'s have returned, and the ones
|
||||
// used in this package also acquire [extension.mu]. See #17894.
|
||||
e.ec.Close()
|
||||
e.mu.Lock()
|
||||
defer e.mu.Unlock()
|
||||
e.shutdown = true
|
||||
e.ec.Close()
|
||||
e.stopRelayServerLocked()
|
||||
return nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user