Skip to content

[release/7.0] [RateLimiting] Handle Timer jitter #74971

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

Merged
carlossanlop merged 8 commits into from
Sep 3, 2022
Merged

[release/7.0] [RateLimiting] Handle Timer jitter #74971

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fcc4e01
[RateLimiting] TryReplenish handles multiple replenish periods at a time
BrennanConroy Jun 29, 2022
68a01ca
ignore tick on auto
BrennanConroy Aug 19, 2022
3a169d4
fixup
BrennanConroy Aug 19, 2022
af637b0
partial
BrennanConroy Aug 22, 2022
3536790
allow TimeSpan.Zero
BrennanConroy Aug 23, 2022
8c07cb1
no special case
BrennanConroy Sep 1, 2022
7513e71
TimeSpan.Zero
BrennanConroy Sep 2, 2022
c5754dc
Apply suggestions from code review
BrennanConroy Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup
  • Loading branch information
@BrennanConroy
BrennanConroy authored and github-actions committed Sep 1, 2022
commit 3a169d413559e948c8d99840b86419cbd9f52a5f
2 changes: 0 additions & 2 deletions ...System.Threading.RateLimiting/src/System/Threading/RateLimiting/FixedWindowRateLimiter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,6 @@ private void ReplenishInternal(long nowTicks)
return;
}

// increment last tick by the number of replenish periods that occurred since the last replenish
// this way if replenish isn't being called every ReplenishmentPeriod we correctly track it so we know when replenishes should be occurring
_lastReplenishmentTick = nowTicks;

int availableRequestCounters = _requestCount;
Expand Down
15 changes: 4 additions & 11 deletions ...stem.Threading.RateLimiting/src/System/Threading/RateLimiting/SlidingWindowRateLimiter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,29 +294,22 @@ private void ReplenishInternal(long nowTicks)
return;
}

// increment last tick by the number of replenish periods that occurred since the last replenish
// this way if replenish isn't being called every ReplenishmentPeriod we correctly track it so we know when replenishes should be occurring
_lastReplenishmentTick = nowTicks;

int initialRequestCount = _requestCount;
// Increment the current segment index while move the window
// We need to know the no. of requests that were acquired in a segment previously to ensure that we don't acquire more than the permit limit.
_currentSegmentIndex = (_currentSegmentIndex + 1) % _options.SegmentsPerWindow;
int oldSegmentRequestCount = _requestsPerSegment[_currentSegmentIndex];
_requestsPerSegment[_currentSegmentIndex] = 0;

if (oldSegmentRequestCount != 0)
if (oldSegmentRequestCount == 0)
{
_requestCount += oldSegmentRequestCount;
Debug.Assert(_requestCount <= _options.PermitLimit);
}

if (initialRequestCount == _requestCount)
{
// no requests added, queued items don't need updating
return;
}

_requestCount += oldSegmentRequestCount;
Debug.Assert(_requestCount <= _options.PermitLimit);

// Process queued requests
while (_queue.Count > 0)
{
Expand Down