-
Notifications
You must be signed in to change notification settings - Fork 4.8k
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
fix(balancer): respect max retries #12346
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In the balancer phase, when obtaining a connection from the upstream connection pool, the `cached` attribute of the peer connection is set to 1(`pc->cached = 1;`), indicating that the connection is obtained from the cache. If an error occurs during the use of this connection, such as "upstream prematurely closed connection" the system will increase the `tries` attribute of the peer connection by executing `u->peer.tries++`. `tries` represents the maximum number of attempts to connect to an upstream server. It is equal to the normal 1 attempt + `retries` (default value is 5) = 6. The occurrence of `u->peer.tries++` is unexpected and it results in the actual retry count exceeding 6 in worst cases. This PR restores tries by callbacks to the balancer when `u->peer.tries++` is unexpectedly set. FIX [FTI-5616](https://konghq.atlassian.net/browse/FTI-5616) Signed-off-by: tzssangglass <tzssangglass@gmail.com>
3 tasks
oowl
approved these changes
Jan 15, 2024
ms2008
approved these changes
Jan 15, 2024
The previously reviewed PR #12242 had some issues with the latest CI configuration file, so I pulled out a new branch from the master and ported it to this PR. |
catbro666
approved these changes
Jan 18, 2024
chronolaw
added a commit
that referenced
this pull request
Jan 18, 2024
chronolaw
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 18, 2024
3 tasks
3 tasks
tzssangglass
added a commit
to tzssangglass/kong
that referenced
this pull request
Jan 19, 2024
In the balancer phase, when obtaining a connection from the upstream connection pool, the `cached` attribute of the peer connection is set to 1(`pc->cached = 1;`), indicating that the connection is obtained from the cache. If an error occurs during the use of this connection, such as "upstream prematurely closed connection" the system will increase the `tries` attribute of the peer connection by executing `u->peer.tries++`. `tries` represents the maximum number of attempts to connect to an upstream server. It is equal to the normal 1 attempt + `retries` (default value is 5) = 6. The occurrence of `u->peer.tries++` is unexpected and it results in the actual retry count exceeding 6 in worst cases. This PR restores tries by callbacks to the balancer when `u->peer.tries++` is unexpectedly set. FIX [FTI-5616](https://konghq.atlassian.net/browse/FTI-5616) Signed-off-by: tzssangglass <tzssangglass@gmail.com>
kikito
pushed a commit
that referenced
this pull request
Jan 24, 2024
This was referenced Jan 24, 2024
1 task
chronolaw
reviewed
Jan 31, 2024
chobits
reviewed
Jan 31, 2024
tzssangglass
added a commit
that referenced
this pull request
Jan 31, 2024
…d when handling cached connection errors address comments of #12346 Signed-off-by: tzssangglass <tzssangglass@gmail.com>
3 tasks
kikito
pushed a commit
that referenced
this pull request
Jan 31, 2024
…d when handling cached connection errors (#12468) * fix(balancer): ensure the `notify` callback is invoked only if defined when handling cached connection errors address comments of #12346 Signed-off-by: tzssangglass <tzssangglass@gmail.com> * fix Signed-off-by: tzssangglass <tzssangglass@gmail.com> --------- Signed-off-by: tzssangglass <tzssangglass@gmail.com>
github-actions bot
pushed a commit
that referenced
this pull request
Jan 31, 2024
…d when handling cached connection errors (#12468) * fix(balancer): ensure the `notify` callback is invoked only if defined when handling cached connection errors address comments of #12346 Signed-off-by: tzssangglass <tzssangglass@gmail.com> * fix Signed-off-by: tzssangglass <tzssangglass@gmail.com> --------- Signed-off-by: tzssangglass <tzssangglass@gmail.com> (cherry picked from commit 415ca0f)
3 tasks
kikito
pushed a commit
that referenced
this pull request
Jan 31, 2024
…d when handling cached connection errors (#12468) * fix(balancer): ensure the `notify` callback is invoked only if defined when handling cached connection errors address comments of #12346 Signed-off-by: tzssangglass <tzssangglass@gmail.com> * fix Signed-off-by: tzssangglass <tzssangglass@gmail.com> --------- Signed-off-by: tzssangglass <tzssangglass@gmail.com> (cherry picked from commit 415ca0f)
github-actions bot
pushed a commit
that referenced
this pull request
Jan 31, 2024
* 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)
bungle
pushed a commit
that referenced
this pull request
Jan 31, 2024
* 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)
tzssangglass
added a commit
to tzssangglass/kong
that referenced
this pull request
Feb 1, 2024
…when handling cached connection errors address comments of Kong#12346 Signed-off-by: tzssangglass <tzssangglass@gmail.com>
3 tasks
tzssangglass
added a commit
that referenced
this pull request
Feb 2, 2024
This reverts commit 2c7d1d6.
tzssangglass
added a commit
that referenced
this pull request
Feb 2, 2024
This reverts commit 5160fee.
tzssangglass
added a commit
that referenced
this pull request
Feb 2, 2024
This reverts commit b0889c3.
AndyZhang0707
added a commit
that referenced
this pull request
Jul 18, 2024
This reverts commit aa7c405.
AndyZhang0707
added a commit
that referenced
this pull request
Jul 26, 2024
This reverts commit aa7c405.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
In the balancer phase, when obtaining a connection from the upstream connection pool, the
cached
attribute of the peer connection is set to 1(pc->cached = 1;
), indicating that the connection is obtained from the cache.If an error occurs during the use of this connection, such as "upstream prematurely closed connection" the system will increase the
tries
attribute of the peer connection by executingu->peer.tries++
.tries
represents the maximum number of attempts to connect to an upstream server. It is equal to the normal 1 attempt +retries
(default value is 5) = 6.The occurrence of
u->peer.tries++
is unexpected and it results in the actual retry count exceeding 6 in worst cases.This PR restores tries by callbacks to the balancer when
u->peer.tries++
is unexpectedly set.Checklist
changelog/unreleased/kong
orskip-changelog
label added on PR if changelog is unnecessary. README.mdIssue reference
Fix FTI-5616