Browse Source

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

This was causing a flake in another repo.

Signed-off-by: Maisem Ali <[email protected]>
Maisem Ali 4 years ago
parent
commit
ba2c0c3145
1 changed files with 3 additions and 3 deletions
  1. 3 3
      control/controlclient/auto.go

+ 3 - 3
control/controlclient/auto.go

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