Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix memory leak when using call context propagation with cancellation token #2421

Merged
merged 2 commits into from
Apr 29, 2024
Merged

Fix memory leak when using call context propagation with cancellation token #2421

merged 2 commits into from
Apr 29, 2024

Conversation

JamesNK
Copy link
Member

@JamesNK JamesNK commented Apr 28, 2024 •
edited
Loading

Fixes #2419

There was an incorrect assumption that the disposable call was always disposed of by the client. It isn't, which could create a memory leak under the right situation (context propagation + long lasting cancellation token + many unary calls)

Fix is to make the interceptor configure the returned call type to automatically dispose its own state once finished with reading the response.

@JamesNK JamesNK mentioned this pull request Apr 28, 2024
Closed
mgravell
mgravell reviewed Apr 28, 2024
View reviewed changes
src/Grpc.AspNetCore.Server.ClientFactory/ContextPropagationInterceptor.cs
{
try
{
return await task.ConfigureAwait(false);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might this be a rare occasion when ContinueWith makes more sense?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why would it be better here? From what I know, async/await is preferred.

mgravell
mgravell approved these changes Apr 28, 2024
View reviewed changes
Copy link
Contributor

@mgravell mgravell left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems fine; added one "consider, but up to you"; a shame this couldn't go into the underlying stream to prevent needing a decorator

@JamesNK JamesNK merged commit 2d9df58 into grpc:master Apr 29, 2024
5 checks passed
oguzhand95 referenced this pull request in cerbos/cerbos-sdk-net May 31, 2024
@renovate
chore(deps): Update .net deps (#134)
edd8c3b 
[![Mend
Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com)

This PR contains the following updates:

| Package | Change | Age | Adoption | Passing | Confidence |
|---|---|---|---|---|---|
| [Google.Protobuf](https://togithub.com/protocolbuffers/protobuf) |
`3.26.1` -> `3.27.0` |
[![age](https://developer.mend.io/api/mc/badges/age/nuget/Google.Protobuf/3.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/nuget/Google.Protobuf/3.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/nuget/Google.Protobuf/3.26.1/3.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Google.Protobuf/3.26.1/3.27.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
| [Grpc.Net.Client](https://togithub.com/grpc/grpc-dotnet) | `2.62.0` ->
`2.63.0` |
[![age](https://developer.mend.io/api/mc/badges/age/nuget/Grpc.Net.Client/2.63.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/nuget/Grpc.Net.Client/2.63.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/nuget/Grpc.Net.Client/2.62.0/2.63.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Grpc.Net.Client/2.62.0/2.63.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
| [Microsoft.NET.Test.Sdk](https://togithub.com/microsoft/vstest) |
`17.9.0` -> `17.10.0` |
[![age](https://developer.mend.io/api/mc/badges/age/nuget/Microsoft.NET.Test.Sdk/17.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![adoption](https://developer.mend.io/api/mc/badges/adoption/nuget/Microsoft.NET.Test.Sdk/17.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![passing](https://developer.mend.io/api/mc/badges/compatibility/nuget/Microsoft.NET.Test.Sdk/17.9.0/17.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|
[![confidence](https://developer.mend.io/api/mc/badges/confidence/nuget/Microsoft.NET.Test.Sdk/17.9.0/17.10.0?slim=true)](https://docs.renovatebot.com/merge-confidence/)
|

---

### Release Notes

<details>
<summary>grpc/grpc-dotnet (Grpc.Net.Client)</summary>

###
[`v2.63.0`](https://togithub.com/grpc/grpc-dotnet/releases/tag/v2.63.0)

##### What's Changed

- Prevent block inside ResolveAsync from blocking
PollingResolver.Refresh by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2385](https://togithub.com/grpc/grpc-dotnet/pull/2385)
- Bump follow-redirects from 1.15.4 to 1.15.6 in
/testassets/InteropTestsGrpcWebWebsite/Tests by
[@&#8203;dependabot](https://togithub.com/dependabot) in
[https://github.com/grpc/grpc-dotnet/pull/2392](https://togithub.com/grpc/grpc-dotnet/pull/2392)
- Update microsoft-support.md by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2403](https://togithub.com/grpc/grpc-dotnet/pull/2403)
- fix a couple typos in README.md by
[@&#8203;jjanuszkiewicz](https://togithub.com/jjanuszkiewicz) in
[https://github.com/grpc/grpc-dotnet/pull/2397](https://togithub.com/grpc/grpc-dotnet/pull/2397)
- Interrupt existing subchannel connect attempt when reconnect is
requested by [@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2410](https://togithub.com/grpc/grpc-dotnet/pull/2410)
- Update Directory.Packages.props by
[@&#8203;WeihanLi](https://togithub.com/WeihanLi) in
[https://github.com/grpc/grpc-dotnet/pull/2413](https://togithub.com/grpc/grpc-dotnet/pull/2413)
- [#&#8203;2401](https://togithub.com/grpc/grpc-dotnet/issues/2401) Add
new TFM's so package dependency can be removed by
[@&#8203;thompson-tomo](https://togithub.com/thompson-tomo) in
[https://github.com/grpc/grpc-dotnet/pull/2402](https://togithub.com/grpc/grpc-dotnet/pull/2402)
- support `ReadAllAsync` for netstandard2.0 by
[@&#8203;WeihanLi](https://togithub.com/WeihanLi) in
[https://github.com/grpc/grpc-dotnet/pull/2411](https://togithub.com/grpc/grpc-dotnet/pull/2411)
- Fix ObjectDisposedException message by
[@&#8203;drewnoakes](https://togithub.com/drewnoakes) in
[https://github.com/grpc/grpc-dotnet/pull/2415](https://togithub.com/grpc/grpc-dotnet/pull/2415)
- Enable multiple connections with WinHttpHandler by default by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2416](https://togithub.com/grpc/grpc-dotnet/pull/2416)
- Fix memory leak when using call context propagation with cancellation
token by [@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2421](https://togithub.com/grpc/grpc-dotnet/pull/2421)
- Fix HTTP/3 test errors on .NET 6 by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2423](https://togithub.com/grpc/grpc-dotnet/pull/2423)
- Add semaphore to limit subchannel connect to prevent race conditions
by [@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2422](https://togithub.com/grpc/grpc-dotnet/pull/2422)
- Don't capture async locals in resolver by
[@&#8203;JamesNK](https://togithub.com/JamesNK) in
[https://github.com/grpc/grpc-dotnet/pull/2426](https://togithub.com/grpc/grpc-dotnet/pull/2426)
- Update Grpc.Tools to 2.63 by
[@&#8203;apolcyn](https://togithub.com/apolcyn) in
[https://github.com/grpc/grpc-dotnet/pull/2429](https://togithub.com/grpc/grpc-dotnet/pull/2429)
- Bump 2.63.x branch to 2.63.0-pre1 by
[@&#8203;apolcyn](https://togithub.com/apolcyn) in
[https://github.com/grpc/grpc-dotnet/pull/2430](https://togithub.com/grpc/grpc-dotnet/pull/2430)
- Fix build on v2.63.x - cherry pick
[https://github.com/grpc/grpc-dotnet/pull/2437](https://togithub.com/grpc/grpc-dotnet/pull/2437)
by [@&#8203;apolcyn](https://togithub.com/apolcyn) in
[https://github.com/grpc/grpc-dotnet/pull/2442](https://togithub.com/grpc/grpc-dotnet/pull/2442)
- Bump 2.63.x to stable release by
[@&#8203;apolcyn](https://togithub.com/apolcyn) in
[https://github.com/grpc/grpc-dotnet/pull/2440](https://togithub.com/grpc/grpc-dotnet/pull/2440)

##### New Contributors

- [@&#8203;jjanuszkiewicz](https://togithub.com/jjanuszkiewicz) made
their first contribution in
[https://github.com/grpc/grpc-dotnet/pull/2397](https://togithub.com/grpc/grpc-dotnet/pull/2397)
- [@&#8203;thompson-tomo](https://togithub.com/thompson-tomo) made their
first contribution in
[https://github.com/grpc/grpc-dotnet/pull/2402](https://togithub.com/grpc/grpc-dotnet/pull/2402)
- [@&#8203;drewnoakes](https://togithub.com/drewnoakes) made their first
contribution in
[https://github.com/grpc/grpc-dotnet/pull/2415](https://togithub.com/grpc/grpc-dotnet/pull/2415)

**Full Changelog**:
grpc/grpc-dotnet@v2.62.0...v2.63.0

</details>

<details>
<summary>microsoft/vstest (Microsoft.NET.Test.Sdk)</summary>

###
[`v17.10.0`](https://togithub.com/microsoft/vstest/releases/tag/v17.10.0)

##### What's Changed

- Add missing runtimeconfig.json file for 8.0 by
[@&#8203;MarcoRossignoli](https://togithub.com/MarcoRossignoli) in
[https://github.com/microsoft/vstest/pull/4792](https://togithub.com/microsoft/vstest/pull/4792)
- Localized file check-in by OneLocBuild Task: Build definition ID 1222:
Build ID
[`2338548`](https://togithub.com/microsoft/vstest/commit/2338548) by
[@&#8203;dotnet-bot](https://togithub.com/dotnet-bot) in
[https://github.com/microsoft/vstest/pull/4794](https://togithub.com/microsoft/vstest/pull/4794)
- Disable testhost prestart by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4833](https://togithub.com/microsoft/vstest/pull/4833)
- Terminal logger fixes by [@&#8203;nohwnd](https://togithub.com/nohwnd)
in
[https://github.com/microsoft/vstest/pull/4834](https://togithub.com/microsoft/vstest/pull/4834)
- Add RiscV64 by [@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4838](https://togithub.com/microsoft/vstest/pull/4838)
- Add deterministic source mapping storing for Microsoft.CodeCoverage by
[@&#8203;jakubch1](https://togithub.com/jakubch1) in
[https://github.com/microsoft/vstest/pull/4849](https://togithub.com/microsoft/vstest/pull/4849)
- Fix terminal logger encoding & error by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4853](https://togithub.com/microsoft/vstest/pull/4853)
- Update sourcebuild configuration to build net previous and net current
by [@&#8203;Evangelink](https://togithub.com/Evangelink) in
[https://github.com/microsoft/vstest/pull/4856](https://togithub.com/microsoft/vstest/pull/4856)
- Updating version of Microsoft.VisualStudio.Interop to 17.10 by
[@&#8203;MSLukeWest](https://togithub.com/MSLukeWest) in
[https://github.com/microsoft/vstest/pull/4866](https://togithub.com/microsoft/vstest/pull/4866)
- Add VSTEST_DIAG_VERBOSITY to help by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4882](https://togithub.com/microsoft/vstest/pull/4882)
- Fix feature flag name by [@&#8203;nohwnd](https://togithub.com/nohwnd)
in
[https://github.com/microsoft/vstest/pull/4885](https://togithub.com/microsoft/vstest/pull/4885)
- Improve terminal logger by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4877](https://togithub.com/microsoft/vstest/pull/4877)
- Remove PackageLicenseFile preventing PackageLicenseExpression from
working by [@&#8203;lahma](https://togithub.com/lahma) in
[https://github.com/microsoft/vstest/pull/4890](https://togithub.com/microsoft/vstest/pull/4890)
- Add GitHub Actions logger by
[@&#8203;martincostello](https://togithub.com/martincostello) in
[https://github.com/microsoft/vstest/pull/4906](https://togithub.com/microsoft/vstest/pull/4906)
- Ensure to send a session complete event by
[@&#8203;drognanar](https://togithub.com/drognanar) in
[https://github.com/microsoft/vstest/pull/4878](https://togithub.com/microsoft/vstest/pull/4878)
- specify Win10 + maxversiontested to enable xaml APIs to be used in
tests running under testhost.exe by
[@&#8203;ChrisGuzak](https://togithub.com/ChrisGuzak) in
[https://github.com/microsoft/vstest/pull/4888](https://togithub.com/microsoft/vstest/pull/4888)
- Make VSTest repo buildable in VMR non-source-build by
[@&#8203;ViktorHofer](https://togithub.com/ViktorHofer) in
[https://github.com/microsoft/vstest/pull/4920](https://togithub.com/microsoft/vstest/pull/4920)
- Migrate pipelines by [@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4921](https://togithub.com/microsoft/vstest/pull/4921)
- Add test name to MSBuild where we have frame. by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4935](https://togithub.com/microsoft/vstest/pull/4935)
- \[rel/17.10] Add list of known TestingPlatform dlls by
[@&#8203;nohwnd](https://togithub.com/nohwnd) in
[https://github.com/microsoft/vstest/pull/4982](https://togithub.com/microsoft/vstest/pull/4982)

And many infrastructure related changes and updates.

##### New Contributors

- [@&#8203;ellahathaway](https://togithub.com/ellahathaway) made their
first contribution in
[https://github.com/microsoft/vstest/pull/4785](https://togithub.com/microsoft/vstest/pull/4785)
- [@&#8203;MSLukeWest](https://togithub.com/MSLukeWest) made their first
contribution in
[https://github.com/microsoft/vstest/pull/4866](https://togithub.com/microsoft/vstest/pull/4866)
- [@&#8203;lahma](https://togithub.com/lahma) made their first
contribution in
[https://github.com/microsoft/vstest/pull/4890](https://togithub.com/microsoft/vstest/pull/4890)
- [@&#8203;ChrisGuzak](https://togithub.com/ChrisGuzak) made their first
contribution in
[https://github.com/microsoft/vstest/pull/4888](https://togithub.com/microsoft/vstest/pull/4888)

**Full Changelog**:
microsoft/vstest@v17.9.0...v17.10.0

</details>

---

### Configuration

📅 **Schedule**: Branch creation - "before 4am on Monday" (UTC),
Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you
are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the
rebase/retry checkbox.

👻 **Immortal**: This PR will be recreated if closed unmerged. Get
[config help](https://togithub.com/renovatebot/renovate/discussions) if
that's undesired.

---

- [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check
this box

---

This PR has been generated by [Mend
Renovate](https://www.mend.io/free-developer-tools/renovate/). View
repository job log
[here](https://developer.mend.io/github/cerbos/cerbos-sdk-net).

<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ1cGRhdGVkSW5WZXIiOiIzNy4zNjguMTAiLCJ0YXJnZXRCcmFuY2giOiJtYWluIiwibGFiZWxzIjpbImJvdHMiLCJjaG9yZSIsImNpIl19-->

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Signed-off-by: Oğuzhan Durgun <oguzhandurgun95@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mgravell mgravell mgravell approved these changes

@ReubenBond ReubenBond Awaiting requested review from ReubenBond

@BrennanConroy BrennanConroy Awaiting requested review from BrennanConroy

@amcasey amcasey Awaiting requested review from amcasey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Memory Leak when using ContextPropagationInterceptor
2 participants
@JamesNK @mgravell