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.

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

feat: Add option retry_timeout that like nginx's proxy_next_upstream_timeout #4574

Merged
merged 4 commits into from
Jul 14, 2021
Merged

feat: Add option retry_timeout that like nginx's proxy_next_upstream_timeout #4574

merged 4 commits into from
Jul 14, 2021

Conversation

chzhuo
Copy link
Contributor

@chzhuo chzhuo commented Jul 9, 2021

Add option retry_timeout to Limits the time during which a request can be passed to next upstream.

What this PR does / why we need it:

option retry_timeout like nginx's directive proxy_next_upstream_timeout

Pre-submission checklist:

  • Did you explain what problem does this PR solve? Or what new features have been added?
  • Have you added corresponding test cases?
  • Have you modified the corresponding document?
  • Is this PR backward compatible? If it is not backward compatible, please discuss on the mailing list first

spacewander
spacewander reviewed Jul 9, 2021
View reviewed changes
t/admin/upstream.t Outdated Show resolved Hide resolved
t/lib/server.lua Outdated Show resolved Hide resolved
Yiyiyimu
Yiyiyimu approved these changes Jul 9, 2021
View reviewed changes
Copy link
Member

@Yiyiyimu Yiyiyimu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

tokers
tokers reviewed Jul 10, 2021
View reviewed changes
docs/zh/latest/admin-api.md Outdated Show resolved Hide resolved
spacewander
spacewander requested changes Jul 10, 2021
View reviewed changes
t/admin/upstream3.t Outdated Show resolved Hide resolved
tokers
tokers reviewed Jul 13, 2021
View reviewed changes
t/admin/upstream3.t Outdated Show resolved Hide resolved
@tokers
Copy link
Contributor

tokers commented Jul 13, 2021

@chzhuo Please resolve the conflicts.

@spacewander spacewander merged commit 307c7f6 into apache:master Jul 14, 2021
@liuxiran liuxiran mentioned this pull request Aug 25, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yiyiyimu Yiyiyimu Yiyiyimu approved these changes

@tokers tokers tokers approved these changes

@spacewander spacewander spacewander approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@chzhuo @tokers @spacewander @Yiyiyimu