From 933877de0c8569a642d4f13ae51a6c63e4358c0a Mon Sep 17 00:00:00 2001 From: Jonathan Hess Date: Thu, 27 Aug 2026 17:31:59 +0000 Subject: [PATCH] fix: check context cancellation in serveSocketMount --- internal/proxy/proxy.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 1f241bde6..5c8732614 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -790,8 +790,13 @@ func (c *Client) Close() error { // serveSocketMount persistently listens to the socketMounts listener and proxies connections to a // given Cloud SQL instance. -func (c *Client) serveSocketMount(_ context.Context, s *socketMount) error { +func (c *Client) serveSocketMount(ctx context.Context, s *socketMount) error { for { + select { + case <-ctx.Done(): + return nil + default: + } cConn, err := s.Accept() if err != nil { if nerr, ok := err.(net.Error); ok && nerr.Timeout() {