Skip to content

tonic-xds: ignore status::Ok in the retriable code list #2585

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

Merged
LucioFranco merged 4 commits into from
Apr 9, 2026
+9 −1
Merged

tonic-xds: ignore status::Ok in the retriable code list #2585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
df11267
ok should not be retried
gu0keno0 Apr 8, 2026
a718258
small fix to router
gu0keno0 Apr 8, 2026
9833820
fix test
gu0keno0 Apr 8, 2026
4e5ad3d
comment about deprecated
gu0keno0 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion tonic-xds/src/client/retry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub(crate) fn is_retryable_grpc_status_code(
code: tonic::Code,
retryable_codes: &[tonic::Code],
) -> bool {
retryable_codes.contains(&code)
code != tonic::Code::Ok && retryable_codes.contains(&code)
}

/// Check if a request should be retried, either because of a retryable connection error
Expand Down Expand Up @@ -439,6 +439,12 @@ mod tests {
assert!(!is_retryable_grpc_status_code(tonic::Code::Ok, &codes));
}

#[test]
fn test_ok_should_not_be_retried() {
let codes = vec![tonic::Code::Ok];
assert!(!is_retryable_grpc_status_code(tonic::Code::Ok, &codes))
}

#[test]
fn test_empty_retryable_codes() {
assert!(!is_retryable_grpc_status_code(
Expand Down
2 changes: 2 additions & 0 deletions tonic-xds/src/xds/resource/route_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,8 @@ fn validate_header_matcher(
use envoy_types::pb::envoy::config::route::v3::header_matcher::HeaderMatchSpecifier;
use envoy_types::pb::envoy::r#type::matcher::v3::string_matcher::MatchPattern;

// It's common that some xDS features are marked as deprecated while they are still widely in-use.
#[allow(deprecated)]
let match_specifier = match hm.header_match_specifier {
Some(HeaderMatchSpecifier::ExactMatch(v)) => HeaderMatchSpecifierConfig::Exact {
value: v,
Expand Down
Loading