TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-03 06:45:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: call direct.Close after map requests are complete

Browse Source 
This was causing a flake in another repo.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-03-08 21:04:42 -08:00 committed by Maisem Ali
parent 61cdcf4082
commit ba2c0c3145
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
control/controlclient/auto.go
View File

@ -686,15 +686,15 @@ func (c *Auto) Shutdown() {
c.logf("client.Shutdown: inSendStatus=%v", inSendStatus) c.logf("client.Shutdown: inSendStatus=%v", inSendStatus)
if !closed { if !closed {
if direct != nil {
direct.Close()
}
c.unregisterHealthWatch() c.unregisterHealthWatch()
close(c.quit) close(c.quit)
c.cancelAuth() c.cancelAuth()
<-c.authDone <-c.authDone
c.cancelMapUnsafely() c.cancelMapUnsafely()
<-c.mapDone <-c.mapDone
if direct != nil {
direct.Close()
}
c.logf("Client.Shutdown done.") c.logf("Client.Shutdown done.")
} }
} }