Merge pull request #1598 from ydb-platform/fix-goroutine-leak

* Fixed goroutine leak on failed execute call in query client

CHANGELOG.md

@@ -1,3 +1,5 @@
+* Fixed goroutine leak on failed execute call in query client
+
 ## v3.95.4
 * Fixed connections pool leak on closing sessions
 * Fixed an error in logging session deletion events

internal/query/execute_query.go

@@ -126,14 +126,22 @@ func execute(
 		return nil, xerrors.WithStackTrace(err)
 	}
 
-	executeCtx := xcontext.ValueOnly(ctx)
+	executeCtx, executeCancel := xcontext.WithCancel(xcontext.ValueOnly(ctx))
+	defer func() {
+		if finalErr != nil {
+			executeCancel()
+		}
+	}()
 
 	stream, err := c.ExecuteQuery(executeCtx, request, callOptions...)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}
 
-	r, err := newResult(ctx, stream, append(opts, withStatsCallback(settings.StatsCallback()))...)
+	r, err := newResult(ctx, stream, append(opts,
+		withStatsCallback(settings.StatsCallback()),
+		withOnClose(executeCancel),
+	)...)
 	if err != nil {
 		return nil, xerrors.WithStackTrace(err)
 	}

internal/query/result.go

@@ -39,6 +39,7 @@ type (
 		closed         chan struct{}
 		trace          *trace.Query
 		statsCallback  func(queryStats stats.QueryStats)
+		onClose        []func()
 		onNextPartErr  []func(err error)
 		onTxMeta       []func(txMeta *Ydb_Query.TransactionMeta)
 	}
@@ -98,6 +99,12 @@ func withStatsCallback(callback func(queryStats stats.QueryStats)) resultOption
 	}
 }
 
+func withOnClose(onClose func()) resultOption {
+	return func(s *streamResult) {
+		s.onClose = append(s.onClose, onClose)
+	}
+}
+
 func onNextPartErr(callback func(err error)) resultOption {
 	return func(s *streamResult) {
 		s.onNextPartErr = append(s.onNextPartErr, callback)
@@ -115,22 +122,33 @@ func newResult(
 	stream Ydb_Query_V1.QueryService_ExecuteQueryClient,
 	opts ...resultOption,
 ) (_ *streamResult, finalErr error) {
-	r := streamResult{
-		stream:         stream,
-		closed:         make(chan struct{}),
-		resultSetIndex: -1,
-	}
-	r.closeOnce = sync.OnceFunc(func() {
-		close(r.closed)
-		r.stream = nil
-	})
+	var (
+		closed = make(chan struct{})
+		r      = streamResult{
+			stream: stream,
+			onClose: []func(){
+				func() {
+					close(closed)
+				},
+			},
+			closed:         closed,
+			resultSetIndex: -1,
+		}
+	)
 
 	for _, opt := range opts {
 		if opt != nil {
 			opt(&r)
 		}
 	}
 
+	r.closeOnce = sync.OnceFunc(func() {
+		for _, onClose := range r.onClose {
+			onClose()
+		}
+		r.stream = nil
+	})
+
 	if r.trace != nil {
 		onDone := trace.QueryOnResultNew(r.trace, &ctx,
 			stack.FunctionID("github.com/ydb-platform/ydb-go-sdk/v3/internal/query.newResult"),