Skip to content

VAULT-36112: Better handling for Retry-After rate limit header. #30887

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

Merged
merged 8 commits into from
Jun 19, 2025

Conversation

miagilepner
Copy link
Collaborator

Description

This PR fixes two issues:

  1. The api.Client doesn't respect the Retry-After header by default. The PR updates the backoff strategy to use the value from the Retry-After header, if it exists.
  2. The vault server rounds down it's retry time to the nearest second. This is particularly bad if the value is 0<x<1 second, because the client will retry immediately and get rejected. This PR updates our logic to round up.

The go-retryablehttp change will need to be merged. @katbyte is the maintainer for that repo and is waiting to check with a team member next week before approving the PR.

TODO only if you're a HashiCorp employee

  • Backport Labels: If this fix needs to be backported, use the appropriate backport/ label that matches the desired release branch. Note that in the CE repo, the latest release branch will look like backport/x.x.x, but older release branches will be backport/ent/x.x.x+ent.
    • LTS: If this fixes a critical security vulnerability or severity 1 bug, it will also need to be backported to the current LTS versions of Vault. To ensure this, use all available enterprise labels.
  • ENT Breakage: If this PR either 1) removes a public function OR 2) changes the signature
    of a public function, even if that change is in a CE file, double check that
    applying the patch for this PR to the ENT repo and running tests doesn't
    break any tests. Sometimes ENT only tests rely on public functions in CE
    files.
  • Jira: If this change has an associated Jira, it's referenced either
    in the PR description, commit message, or branch name.
  • RFC: If this change has an associated RFC, please link it in the description.
  • ENT PR: If this change has an associated ENT PR, please link it in the
    description. Also, make sure the changelog is in this PR, not in your ENT PR.

@miagilepner miagilepner modified the milestones: 1.19.6, 1.20.0-rc Jun 6, 2025
@github-actions github-actions bot added the hashicorp-contributed-pr If the PR is HashiCorp (i.e. not-community) contributed label Jun 6, 2025
Copy link

github-actions bot commented Jun 6, 2025

CI Results:
All Go tests succeeded! ✅

@miagilepner miagilepner marked this pull request as ready for review June 18, 2025 14:36
@miagilepner miagilepner requested a review from a team as a code owner June 18, 2025 14:36
@miagilepner miagilepner requested review from akshya96, bosouza and biazmoreira and removed request for akshya96 June 18, 2025 14:37
Copy link

github-actions bot commented Jun 18, 2025

Build Results:
All builds succeeded! ✅

@miagilepner miagilepner modified the milestones: 1.20.0-rc, 1.20.0 Jun 18, 2025
@miagilepner miagilepner merged commit 544edd5 into main Jun 19, 2025
111 of 131 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants