Fix NoopLimiter disposal in DefaultPartitionedRateLimiter Heartbeat by Copilot · Pull Request #127582 · dotnet/runtime

Copilot · 2026-04-29T20:47:05Z

Fixes DefaultPartitionedRateLimiter so that NoopLimiter partitions are evicted and disposed by the Heartbeat timer, which previously never happened because NoopLimiter.IdleDuration always returns null.

Changes Made

Introduced a LimiterEntry wrapper that tracks a LastAccessTimestamp (updated on each Acquire/WaitAsync call) alongside the RateLimiter instance.
Added GetIdleDuration(LimiterEntry) helper that falls back to the elapsed time since last access for NoopLimiter (whose IdleDuration is always null), and returns null for all other limiter types that return null (preserving the existing "do not evict" contract).
Updated the Heartbeat eviction check to use the is TimeSpan idleDuration && idleDuration > s_idleTimeLimit pattern (with ?? TimeSpan.Zero for the under-lock re-check), correctly handling the nullable TimeSpan? return — null skips eviction, matching the original pattern.
Used Volatile.Read/Volatile.Write for atomic 64-bit timestamp access on 32-bit platforms.
Added a RateLimiterHelper.GetElapsedTime(long) overload to avoid .GetValueOrDefault() at call sites.
Added tests covering NoopLimiter eviction via Heartbeat and verifying that non-NoopLimiter partitions with IdleDuration == null are not evicted while active.

dotnet-policy-service · 2026-04-29T20:54:00Z

Tagging subscribers to this area: @JulieLeeMSFT, @VSadov
See info in area-owners.md if you want to be subscribed.

eduardo-vp

LGTM!

VSadov · 2026-06-16T21:48:51Z

Thanks!

…rtbeat Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

… atomic 64-bit access Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/5d38c664-8bf2-4a12-a8d4-ddff0d031dbd Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

…OrDefault Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/28a47963-2d4b-442b-933c-ddc94f1f5389 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Merges current main into the PR and updates the two new test methods (NoopLimiterPartitionIsCleanedUp and LimiterWithNullIdleDurationIsNotCleanedUp) to: - Pass explicit type arguments to Utils.RunTimerFunc<TResource, TKey> (signature changed in main). - Use the trim-safe Type.GetType + MakeGenericType pattern in the reflection helpers (BackdateLastAccessTimestamp / GetLimiterEntry / GetLazyLimiterEntry) now that the tests project no longer disables the trim analyzer. All 344 tests pass; net11.0 and net481 build with 0 warnings. Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

…e in GetLazyLimiterEntry Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

+        private const string DefaultPartitionedRateLimiterTypeName = "System.Threading.RateLimiting.DefaultPartitionedRateLimiter`2, System.Threading.RateLimiting";
+        private const string DefaultPartitionedRateLimiterEntryTypeName = "System.Threading.RateLimiting.DefaultPartitionedRateLimiter`2+LimiterEntry, System.Threading.RateLimiting";
+


Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

Copilot AI assigned Copilot and VSadov Apr 29, 2026

Copilot AI requested review from Copilot and removed request for Copilot April 29, 2026 20:47

Copilot started work on behalf of VSadov April 29, 2026 20:47 View session

Copilot AI linked an issue Apr 29, 2026 that may be closed by this pull request

DefaultPartitionedRateLimiter never disposes NoopLimiter #124557

Open

github-actions Bot added the area-System.Threading label Apr 29, 2026

Copilot AI requested review from Copilot and removed request for Copilot April 29, 2026 21:12

Copilot AI changed the title ~~[WIP] Fix DefaultPartitionedRateLimiter to dispose NoopLimiter~~ Evict idle partitions whose IdleDuration is always null Apr 29, 2026

Copilot finished work on behalf of VSadov April 29, 2026 21:18

Copilot AI requested a review from VSadov April 29, 2026 21:18

VSadov reviewed Apr 29, 2026

View reviewed changes

Comment thread ...em.Threading.RateLimiting/src/System/Threading/RateLimiting/DefaultPartitionedRateLimiter.cs Outdated

Copilot started work on behalf of VSadov April 29, 2026 22:37 View session

VSadov reviewed Apr 29, 2026

View reviewed changes

Comment thread ...em.Threading.RateLimiting/src/System/Threading/RateLimiting/DefaultPartitionedRateLimiter.cs Outdated

Copilot AI requested review from Copilot and removed request for Copilot April 29, 2026 22:57

Copilot finished work on behalf of VSadov April 29, 2026 22:58

Copilot AI requested a review from VSadov April 29, 2026 22:58

Copilot started work on behalf of VSadov April 29, 2026 22:58 View session

Copilot AI requested review from Copilot and removed request for Copilot April 29, 2026 23:19

Copilot finished work on behalf of VSadov April 29, 2026 23:20

Copilot AI requested review from Copilot and removed request for Copilot June 14, 2026 18:31

Copilot AI changed the title ~~Add type-instance assertion before reflection GetValue in rate limiter test helper~~ Fix NoopLimiter partition eviction in DefaultPartitionedRateLimiter Jun 14, 2026

Copilot AI requested review from Copilot and removed request for Copilot June 14, 2026 18:31

Copilot finished work on behalf of VSadov June 14, 2026 18:31

build-analysis Bot mentioned this pull request Jun 14, 2026

Multiple Helix work items fail on maccatalyst/tvos CoreCLR Release #126460

Open

eduardo-vp approved these changes Jun 16, 2026

View reviewed changes

Comment thread ...braries/System.Threading.RateLimiting/src/System/Threading/RateLimiting/RateLimiterHelper.cs

Copilot AI and others added 17 commits June 16, 2026 22:02

Track per-partition last-access tick so NoopLimiter is evicted by Hea…

185affb

…rtbeat Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Address review: remove redundant timestamp write, use Interlocked for…

4b31962

… atomic 64-bit access Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Clarify comment explaining why first-access has no eviction window

8d250d5

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/7cfc3a4e-ebbd-4056-97a5-69edc299af17 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Use Volatile.Read/Write instead of Interlocked for LastAccessTimestamp

c7e37cd

Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/5d38c664-8bf2-4a12-a8d4-ddff0d031dbd Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Add RateLimiterHelper.GetElapsedTime(long) overload to avoid GetValue…

647bd0c

…OrDefault Agent-Logs-Url: https://github.com/dotnet/runtime/sessions/28a47963-2d4b-442b-933c-ddc94f1f5389 Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Restrict idle eviction fallback to NoopLimiter

2d2f3ed

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Apply remaining changes

762a5ac

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Remove unrelated scratch files accidentally committed earlier

a6443a9

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Potential fix for pull request finding

0119d3d

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

cc19731

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Encapsulate limiter entry timestamp

3dec367

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Centralize reflected type names in rate limiting tests

65a161d

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Add Assert.True(limiterType.IsInstanceOfType(limiter)) before GetValu…

c621259

…e in GetLazyLimiterEntry Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Add explicit null check for nullable TimeSpan comparison in Heartbeat

56eadb6

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Clarify RateLimiting test comment

97da373

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Use is-pattern for nullable TimeSpan comparison in Heartbeat eviction

72f0a07

Co-authored-by: VSadov <8218165+VSadov@users.noreply.github.com>

Copilot AI reviewed Jun 17, 2026

View reviewed changes

build-analysis Bot mentioned this pull request Jun 17, 2026

TestNativeDigits fails for ur-IN on Apple platforms (xunit v3 exposed previously non-running test) #125933

Open

Potential fix for pull request finding

7e6354d

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Copilot AI reviewed Jun 17, 2026

View reviewed changes

Comment thread src/libraries/System.Threading.RateLimiting/tests/PartitionedRateLimiterTests.cs

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix NoopLimiter disposal in DefaultPartitionedRateLimiter Heartbeat#127582

Fix NoopLimiter disposal in DefaultPartitionedRateLimiter Heartbeat#127582
Copilot wants to merge 18 commits into
mainfrom
copilot/fix-noop-limiter-disposal

Copilot AI commented Apr 29, 2026 •

edited

Loading

Uh oh!

dotnet-policy-service Bot commented Apr 29, 2026

Uh oh!

Uh oh!

Uh oh!

eduardo-vp left a comment

Uh oh!

Uh oh!

VSadov commented Jun 16, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

		private const string DefaultPartitionedRateLimiterTypeName = "System.Threading.RateLimiting.DefaultPartitionedRateLimiter`2, System.Threading.RateLimiting";
		private const string DefaultPartitionedRateLimiterEntryTypeName = "System.Threading.RateLimiting.DefaultPartitionedRateLimiter`2+LimiterEntry, System.Threading.RateLimiting";

Conversation

Copilot AI commented Apr 29, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes Made

Uh oh!

dotnet-policy-service Bot commented Apr 29, 2026

Uh oh!

Uh oh!

Uh oh!

eduardo-vp left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

VSadov commented Jun 16, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Copilot AI commented Apr 29, 2026 •

edited

Loading