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

chore(patches): revert the "respect max retries" patch #12470

Merged
merged 3 commits into from
Jan 31, 2024
Merged

chore(patches): revert the "respect max retries" patch #12470

merged 3 commits into from
Jan 31, 2024

Conversation

dndx
Copy link
Member

@dndx dndx commented Jan 31, 2024 •
edited
Loading

We have discovered potential segfault risk with the feature and we do not have enough time to review this in more depth, therefore we have decided to revert the change temporarily to further investigate.

This reverts PR #12346.

FTI-5616

Automatically generated patch diff: https://github.com/Kong/openresty-patches-review/pull/40

@dndx
chore(patches): revert the "respect max retries" patch
6904ce4 
We have discovered potential segfault risk with the feature and we do
not have enough time to review this in more depth, therefore we have
decided to revert the change temporarily to further investigate.

FTI-5616
@dndx dndx marked this pull request as ready for review January 31, 2024 12:48
@dndx dndx added the cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee label Jan 31, 2024
@AndyZhang0707
Copy link
Collaborator

@dndx Shouldn't this pr target for the 3.6.x branch instead of the master branch?

@dndx
Copy link
Member Author

dndx commented Jan 31, 2024

@AndyZhang0707 I had some second thought and maybe we should merge onto master, in case other versions needs to be released during the holiday, we can not backport commit from release/3.6.x.x to another release branch, it has to come from master.

samugi
samugi reviewed Jan 31, 2024
View reviewed changes
Copy link
Member

@samugi samugi left a comment •
edited
Loading

Choose a reason for hiding this comment

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

should probably also revert: https://github.com/Kong/kong/blob/chore/revert_dyn_patch/spec/02-integration/05-proxy/10-balancer/08-retries_spec.lua and https://github.com/Kong/kong/blob/chore/revert_dyn_patch/changelog/unreleased/kong/balancer_respect_max_retries.yml

@dndx dndx merged commit 99a9aa2 into master Jan 31, 2024
28 of 29 checks passed
@dndx dndx deleted the chore/revert_dyn_patch branch January 31, 2024 13:49
@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

github-actions bot pushed a commit that referenced this pull request Jan 31, 2024
@dndx @github-actions
chore(patches): revert the "respect max retries" patch (#12470)
d15d54d 
* chore(patches): revert the "respect max retries" patch

We have discovered potential segfault risk with the feature and we do
not have enough time to review this in more depth, therefore we have
decided to revert the change temporarily to further investigate.

This reverts PR #12346.

FTI-5616

(cherry picked from commit 99a9aa2)
@team-gateway-bot team-gateway-bot mentioned this pull request Jan 31, 2024
Merged
@team-gateway-bot
Copy link
Collaborator

Successfully created backport PR for release/3.6.x:

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

@dndx dndx added cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee and removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jan 31, 2024
@team-gateway-bot
Copy link
Collaborator

Backport failed for release/2.8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/2.8.x
git worktree add -d .worktree/backport-12470-to-release/2.8.x origin/release/2.8.x
cd .worktree/backport-12470-to-release/2.8.x
git switch --create backport-12470-to-release/2.8.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/2.8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/2.8.x
git worktree add -d .worktree/backport-12470-to-release/2.8.x origin/release/2.8.x
cd .worktree/backport-12470-to-release/2.8.x
git switch --create backport-12470-to-release/2.8.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

@kikito kikito added cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee and removed cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee labels Jan 31, 2024
@team-gateway-bot
Copy link
Collaborator

Backport failed for release/2.8.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/2.8.x
git worktree add -d .worktree/backport-12470-to-release/2.8.x origin/release/2.8.x
cd .worktree/backport-12470-to-release/2.8.x
git switch --create backport-12470-to-release/2.8.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Backport failed for release/3.4.x, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release/3.4.x
git worktree add -d .worktree/backport-12470-to-release/3.4.x origin/release/3.4.x
cd .worktree/backport-12470-to-release/3.4.x
git switch --create backport-12470-to-release/3.4.x
git cherry-pick -x 99a9aa2deb3cc4da315b906b592ea3b56366283c

@team-gateway-bot
Copy link
Collaborator

Git push to origin failed for release/3.6.x with exitcode 1

bungle pushed a commit that referenced this pull request Jan 31, 2024
@dndx @bungle
chore(patches): revert the "respect max retries" patch (#12470)
267c389 
* chore(patches): revert the "respect max retries" patch

We have discovered potential segfault risk with the feature and we do
not have enough time to review this in more depth, therefore we have
decided to revert the change temporarily to further investigate.

This reverts PR #12346.

FTI-5616

(cherry picked from commit 99a9aa2)
This was referenced Feb 2, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@samugi samugi samugi left review comments

@tzssangglass tzssangglass tzssangglass approved these changes

@chronolaw chronolaw chronolaw approved these changes

@bungle bungle bungle approved these changes

Assignees

@dndx dndx

Labels
build/bazel cherry-pick kong-ee schedule this PR for cherry-picking to kong/kong-ee size/L skip-changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@dndx @AndyZhang0707 @team-gateway-bot @bungle @samugi @chronolaw @tzssangglass @kikito