fix pool item close

ydb-platform · Nov 14, 2024 · 211365a · 211365a
1 parent e8897e9
commit 211365a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+* Fixed connections pool leak on closing
+
 ## v3.92.2
 * Added `table/options.WithShardNodesInfo()` experimental option to get shard nodeId for describe table call
 

diff --git a/internal/pool/pool.go b/internal/pool/pool.go
@@ -296,15 +296,15 @@ func makeAsyncCloseItemFunc[PT ItemConstraint[T], T any](
 	p *Pool[PT, T],
 ) func(ctx context.Context, item PT) {
 	return func(ctx context.Context, item PT) {
-		closeItemCtx, closeItemCancel := xcontext.WithDone(xcontext.ValueOnly(ctx), p.done)
-		defer closeItemCancel()
-
-		if d := p.config.closeTimeout; d > 0 {
-			closeItemCtx, closeItemCancel = xcontext.WithTimeout(ctx, d)
+		go func() {
+			closeItemCtx, closeItemCancel := xcontext.WithDone(xcontext.ValueOnly(ctx), p.done)
 			defer closeItemCancel()
-		}
 
-		go func() {
+			if d := p.config.closeTimeout; d > 0 {
+				closeItemCtx, closeItemCancel = xcontext.WithTimeout(ctx, d)
+				defer closeItemCancel()
+			}
+
 			_ = item.Close(closeItemCtx)
 		}()
 	}