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

control/controlclient: fix leaked http2 goroutines on shutdown

Browse Source 
If a noise dial was happening concurrently with shutdown, the
http2 goroutines could leak.

Updates tailscale/corp#14950
Updates tailscale/corp#14515
Updates tailscale/corp#14139
Updates tailscale/corp#13175

Signed-off-by: Brad Fitzpatrick <brad@danga.com>
This commit is contained in:
Brad Fitzpatrick 2023-09-28 10:58:15 -07:00
parent 2c0f0ee759
commit 5b3f5eabb5
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control/controlclient/noise.go
View File

@ -177,6 +177,7 @@ type NoiseClient struct {
// mu only protects the following variables. // mu only protects the following variables.
mu sync.Mutex mu sync.Mutex
closed bool
last *noiseConn // or nil last *noiseConn // or nil
nextID int nextID int
connPool map[int]*noiseConn // active connections not yet closed; see noiseConn.Close connPool map[int]*noiseConn // active connections not yet closed; see noiseConn.Close
@ -373,6 +374,7 @@ func (nc *NoiseClient) connClosed(id int) {
// It is a no-op and returns nil if the connection is already closed. // It is a no-op and returns nil if the connection is already closed.
func (nc *NoiseClient) Close() error { func (nc *NoiseClient) Close() error {
nc.mu.Lock() nc.mu.Lock()
nc.closed = true
conns := nc.connPool conns := nc.connPool
nc.connPool = nil nc.connPool = nil
nc.mu.Unlock() nc.mu.Unlock()
@ -472,6 +474,10 @@ func (nc *NoiseClient) dial(ctx context.Context) (*noiseConn, error) {
nc.mu.Lock() nc.mu.Lock()
defer nc.mu.Unlock() defer nc.mu.Unlock()
if nc.closed {
ncc.Close()
return nil, errors.New("noise client closed")
}
mak.Set(&nc.connPool, ncc.id, ncc) mak.Set(&nc.connPool, ncc.id, ncc)
nc.last = ncc nc.last = ncc
return ncc, nil return ncc, nil