buildx: proxy to reuse conns in connecting state

namespacelabs · Oct 13, 2023 · ebeb37e · ebeb37e
1 parent 3569e0a
commit ebeb37e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/internal/cli/cmd/cluster/grpcproxy.go b/internal/cli/cmd/cluster/grpcproxy.go
@@ -60,12 +60,14 @@ func (g *grpcProxy) newBackendClient(ctx context.Context) (*grpc.ClientConn, err
 	defer g.mu.Unlock()
 
 	if g.backendClient != nil {
-		if g.backendClient.GetState() == connectivity.Ready {
-			fmt.Fprintf(console.Debug(ctx), "reused grpc connection\n")
+		connState := g.backendClient.GetState()
+		if connState == connectivity.Ready || connState == connectivity.Connecting {
+			fmt.Fprintf(console.Debug(ctx), "reused grpc connection: %v\n", connState)
 			return g.backendClient, nil
 		}
 
-		fmt.Fprintf(console.Debug(ctx), "cached grpc connection invalidated: %v\n", g.backendClient.GetState())
+		closingErr := g.backendClient.Close()
+		fmt.Fprintf(console.Debug(ctx), "cached grpc connection invalidated: %v, closing err: %v\n", connState, closingErr)
 		g.backendClient = nil
 	}