Skip to content

Navigation Menu

Sign in

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

[RateLimiter] Fix reservations outside the second fixed window #52413

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
Open
wants to merge 2 commits into
base: 6.3
Choose a base branch
Loading
from
Open

[RateLimiter] Fix reservations outside the second fixed window #52413

wants to merge 2 commits into from

Conversation

SanderSander
Copy link

@SanderSander SanderSander commented Nov 1, 2023 •
edited
Loading

Q A
Branch? 6.3
Bug fix? yes
New feature? no
Deprecations? no
Issues Fix #...
License MIT

When using the reserve for a fixed window rate limit, and you reserve outside the current window the wait duration time is calculated incorrectly.

This was for me a problem when using the rate limiter in the Messenger, not necessarily request based limiting.
A current work around is to use the token bucket limiter

Example we have a window of 1 minute and we have a limit of 10 operations in that window.

  • We reserve 10 operations (all accepted because they fit the window).
  • Our next reservation of 10 should have a waiting time of 60 seconds and should fill up the next window
  • Now when we reserve again 10 operations we still have a waiting time of 60 seconds, this means 20 operations in the next window. I would expect the waiting time to be 120 seconds, so that every window is filled with 10 operations.

This PR fixes this calculation, with an unit test for this situation.

@carsonbot carsonbot added this to the 6.3 milestone Nov 1, 2023
@carsonbot
Copy link

Hey!

I see that this is your first PR. That is great! Welcome!

Symfony has a contribution guide which I suggest you to read.

In short:

  • Always add tests
  • Keep backward compatibility (see https://symfony.com/bc).
  • Bug fixes must be submitted against the lowest maintained branch where they apply (see https://symfony.com/releases)
  • Features and deprecations must be submitted against the 6.4 branch.

Review the GitHub status checks of your pull request and try to solve the reported issues. If some tests are failing, try to see if they are failing because of this change.

When two Symfony core team members approve this change, it will be merged and you will become an official Symfony contributor!
If this PR is merged in a lower version branch, it will be merged up to all maintained branches within a few days.

I am going to sit back now and wait for the reviews.

Cheers!

Carsonbot

@carsonbot
Copy link

Hey!

Thanks for your PR. You are targeting branch "6.3" but it seems your PR description refers to branch "6.3 for bug fixes".
Could you update the PR description or change target branch? This helps core maintainers a lot.

Cheers!

Carsonbot

@nicolas-grekas nicolas-grekas modified the milestones: 6.3, 6.4 Feb 1, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Bug RateLimiter Status: Needs Review
Projects
None yet
Milestone
6.4
Development

Successfully merging this pull request may close these issues.
3 participants
@SanderSander @carsonbot @nicolas-grekas
Morty Proxy This is a proxified and sanitized view of the page, visit original site.