Retry on CLOSE_NOTIFY_CONNECTION - #2198
Merged
Merged
Conversation
fool1280
requested review from
AlexanderEllis,
argha-c,
gavinbunney,
ilanachalom,
jguerra,
lindseyreynolds,
matthoffman and
tappenzeller
as code owners
July 25, 2026 07:50
jguerra
approved these changes
Jul 27, 2026
| void connectionErrorsRetriedForAnyMethod() { | ||
| // Regression guard: RESET_CONNECTION and CONNECT_ERROR must stay retryable for all methods, | ||
| // including a non-idempotent (POST) request. A '&&' instead of '||' here would make the | ||
| // condition impossible and silently disable connection-failure retries. |
Collaborator
There was a problem hiding this comment.
nit: remove these comments
| assertThat(proxyEndpoint.isRetryable(OutboundErrorType.CLOSE_NOTIFY_CONNECTION)) | ||
| .isFalse(); | ||
|
|
||
| // GET (idempotent): safe to replay on a fresh connection -> must retry. |
Collaborator
There was a problem hiding this comment.
nit: these test comments aren't really useful
|
|
||
| // Ambiguous failures: the origin MAY have already processed the request, so only | ||
| // retry idempotent methods to avoid duplicating side effects. | ||
| if (err == OutboundErrorType.READ_TIMEOUT || err == OutboundErrorType.CLOSE_NOTIFY_CONNECTION) { |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Zuul was not retrying requests that failed with
CLOSE_NOTIFY_CONNECTIONbecause most close_notifies came from malformed requests, but Zuul now validates headers upstream, so the remaining cases are safe to retry.This change adds
CLOSE_NOTIFY_CONNECTIONtoisRetryable, gated on idempotent methods (GET/HEAD/OPTIONS) so a POST the origin may have already processed is never replayed. The retry logic is refactored into two intent-named branches (connection failures retry for any method; ambiguous failures retry idempotent methods only), and the duplicated idempotency check is pulled into a shared isIdempotentRequest helper. Adds unit tests covering GET vs POST on close_notify, plus a regression guard thatRESET_CONNECTION/CONNECT_ERRORstay retryable for all methods.