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.

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

[7.x] beater/api/intake: fix rate limiting (backport #5518) #5523

Merged
merged 1 commit into from
Jun 24, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2021

This is an automatic backport of pull request #5518 done by Mergify.


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

* beater/api/intake: fix rate limiting

Copy the batch processor in the closure before
copying, to avoid wrapping it multiple times.

* systemtest: fix rate limiting test

The test was wrong, and only passed because of
the bug that has been fixed. We should be using
up the per-IP event limits on the first two
requests, but weren't taking into account the
burst multiplier (limit x 3).

(cherry picked from commit 97a6f9b)
@mergify mergify bot assigned axw Jun 23, 2021
@apmmachine
Copy link
Contributor

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #5523 opened

  • Start Time: 2021-06-23T08:38:30.785+0000

  • Duration: 44 min 38 sec

  • Commit: c613464

Test stats 🧪

Test Results
Failed 0
Passed 4694
Skipped 121
Total 4815

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit 2aa0812 into 7.x Jun 24, 2021
@axw axw deleted the mergify/bp/7.x/pr-5518 branch June 24, 2021 00:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants