defer cancel() leaks memory (#748)

* defer cancel() leaks memory * Update interceptors/retry/retry.go Co-authored-by: Johan Brandhorst-Satzkorn <[email protected]> --------- Co-authored-by: Johan Brandhorst-Satzkorn <[email protected]>
grpc-ecosystem · Feb 11, 2025 · c1423fc · c1423fc
1 parent d75a1b8
commit c1423fc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/interceptors/retry/retry.go b/interceptors/retry/retry.go
@@ -44,8 +44,10 @@ func UnaryClientInterceptor(optFuncs ...CallOption) grpc.UnaryClientInterceptor
 				callOpts.onRetryCallback(parentCtx, attempt, lastErr)
 			}
 			callCtx, cancel := perCallContext(parentCtx, callOpts, attempt)
-			defer cancel() // Clean up potential resources.
 			lastErr = invoker(callCtx, method, req, reply, cc, grpcOpts...)
+			// Cancel the context immediately after invoking the next call in the chain to avoid
+			// holing onto its memory until this function returns.
+			cancel()
 			// TODO(mwitkow): Maybe dial and transport errors should be retriable?
 			if lastErr == nil {
 				return nil