Skip to content

internal/envoy: always set NumRetries so numRetries=-1 actually disables retries #7525

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

Open
SAY-5 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

internal/envoy: always set NumRetries so numRetries=-1 actually disables retries #7525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d0cff6
internal/envoy: always set NumRetries so numRetries=-1 actually disab…
SAY-5 Apr 21, 2026
7f23167
test: align retry policy helpers with always-set NumRetries
May 6, 2026
861e959
Add changelog entry for #7525
May 7, 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
1 change: 1 addition & 0 deletions changelogs/unreleased/7525-SAY-5-small.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix RetryPolicy numRetries=0 being silently coerced to 1 by populating num_retries explicitly when set, so HTTPProxy retry policies that explicitly request zero retries are honored.
11 changes: 8 additions & 3 deletions internal/envoy/v3/route.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,9 +547,14 @@ func retryPolicy(r *dag.Route) *envoy_config_route_v3.RetryPolicy {
RetryOn: r.RetryPolicy.RetryOn,
RetriableStatusCodes: r.RetryPolicy.RetriableStatusCodes,
}
if r.RetryPolicy.NumRetries > 0 {
rp.NumRetries = wrapperspb.UInt32(r.RetryPolicy.NumRetries)
}
// HTTPProxy documents numRetries: -1 as "disable retries". The DAG
// translates -1 to 0 (internal/dag/policy.go), so the DAG value 0
// here uniquely means "user asked for no retries". Previously we
// only set NumRetries when > 0, and Envoy then defaulted to 1 --
// giving exactly one retry instead of none (projectcontour#5944).
// Always set NumRetries (including 0) so Envoy respects the
// documented contract.
rp.NumRetries = wrapperspb.UInt32(r.RetryPolicy.NumRetries)
rp.PerTryTimeout = envoy.Timeout(r.RetryPolicy.PerTryTimeout)

return rp
Expand Down
6 changes: 2 additions & 4 deletions internal/featuretests/v3/envoy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,10 +313,8 @@ func withPrefixRewrite(route *envoy_config_route_v3.Route_Route, replacement str

func withRetryPolicy(route *envoy_config_route_v3.Route_Route, retryOn string, numRetries uint32, perTryTimeout time.Duration) *envoy_config_route_v3.Route_Route {
route.Route.RetryPolicy = &envoy_config_route_v3.RetryPolicy{
RetryOn: retryOn,
}
if numRetries > 0 {
route.Route.RetryPolicy.NumRetries = wrapperspb.UInt32(numRetries)
RetryOn: retryOn,
NumRetries: wrapperspb.UInt32(numRetries),
}
if perTryTimeout > 0 {
route.Route.RetryPolicy.PerTryTimeout = durationpb.New(perTryTimeout)
Expand Down
6 changes: 2 additions & 4 deletions internal/xdscache/v3/route_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3896,10 +3896,8 @@ func routetimeout(cluster string, timeout time.Duration) *envoy_config_route_v3.
func routeretry(cluster, retryOn string, numRetries uint32, perTryTimeout time.Duration) *envoy_config_route_v3.Route_Route {
r := routecluster(cluster)
r.Route.RetryPolicy = &envoy_config_route_v3.RetryPolicy{
RetryOn: retryOn,
}
if numRetries > 0 {
r.Route.RetryPolicy.NumRetries = wrapperspb.UInt32(numRetries)
RetryOn: retryOn,
NumRetries: wrapperspb.UInt32(numRetries),
}
if perTryTimeout > 0 {
r.Route.RetryPolicy.PerTryTimeout = durationpb.New(perTryTimeout)
Expand Down