csi: clarify gRPC connect timeout parameter

hashicorp · Feb 11, 2022 · 787acdf · 787acdf
1 parent 4afc67b
commit 787acdf
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/plugins/csi/client.go b/plugins/csi/client.go
@@ -122,10 +122,12 @@ func NewClient(addr string, logger hclog.Logger) (CSIPlugin, error) {
 }
 
 func newGrpcConn(addr string, logger hclog.Logger) (*grpc.ClientConn, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*1)
+	// after DialContext returns w/ initial connection, closing this
+	// context is a no-op
+	connectCtx, cancel := context.WithTimeout(context.Background(), time.Second*1)
 	defer cancel()
 	conn, err := grpc.DialContext(
-		ctx,
+		connectCtx,
 		addr,
 		grpc.WithBlock(),
 		grpc.WithInsecure(),