From ba2c0c314524329f0bbb1dcf73e09afe56f3c41f Mon Sep 17 00:00:00 2001
From: Maisem Ali <maisem@tailscale.com>
Date: Tue, 8 Mar 2022 21:04:42 -0800
Subject: [PATCH] control/controlclient: call direct.Close after map requests
 are complete

This was causing a flake in another repo.

Signed-off-by: Maisem Ali <maisem@tailscale.com>
---
 control/controlclient/auto.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go
index dea83644d..752c8f1fc 100644
--- a/control/controlclient/auto.go
+++ b/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.")
 	}
 }