From 29c2bb1db6bc7f5d964a76ba48fde570b79abd4d Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Sun, 30 Mar 2025 21:12:29 -0700
Subject: [PATCH] control/controlhttp: reduce some log spam on context cancel

Change-Id: I3ac00ddb29c16e9791ab2be19f454dabd721e4c3
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 control/controlhttp/client.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/control/controlhttp/client.go b/control/controlhttp/client.go
index e971f1253..44de6b0df 100644
--- a/control/controlhttp/client.go
+++ b/control/controlhttp/client.go
@@ -249,6 +249,11 @@ func (a *Dialer) dial(ctx context.Context) (*ClientConn, error) {
 		results[i].conn = nil // so we don't close it in the defer
 		return conn, nil
 	}
+	if ctx.Err() != nil {
+		a.logf("controlhttp: context aborted dialing")
+		return nil, ctx.Err()
+	}
+
 	merr := multierr.New(errs...)
 
 	// If we get here, then we didn't get anywhere with our dial plan; fall back to just using DNS.