Skip to content

fix: Do not set backendRequestTimeout when Retries are set#6421

Merged
zirain merged 2 commits intoenvoyproxy:mainfrom
sudiptob2:fix/6414/backend-req-timeout
Jul 2, 2025
Merged

fix: Do not set backendRequestTimeout when Retries are set#6421
zirain merged 2 commits intoenvoyproxy:mainfrom
sudiptob2:fix/6414/backend-req-timeout

Conversation

@sudiptob2
Copy link
Copy Markdown
Member

Fixes #6414

@codecov
Copy link
Copy Markdown

codecov bot commented Jun 27, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 70.91%. Comparing base (3489680) to head (e3e8555).
Report is 2 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #6421      +/-   ##
==========================================
+ Coverage   70.87%   70.91%   +0.03%     
==========================================
  Files         220      220              
  Lines       37256    37256              
==========================================
+ Hits        26407    26421      +14     
+ Misses       9301     9292       -9     
+ Partials     1548     1543       -5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@sudiptob2 sudiptob2 force-pushed the fix/6414/backend-req-timeout branch from 51bc134 to 8c9ccf8 Compare June 27, 2025 06:23
@sudiptob2 sudiptob2 marked this pull request as ready for review June 27, 2025 07:50
@sudiptob2 sudiptob2 requested a review from a team as a code owner June 27, 2025 07:50
Copy link
Copy Markdown
Member

@rudrakhp rudrakhp Jun 27, 2025

Choose a reason for hiding this comment

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

Should we simply skip setting timeout or set something in status so it's clear that this value is being disregarded? Or a log maybe?

Copy link
Copy Markdown
Contributor

@arkodg arkodg Jul 1, 2025

Choose a reason for hiding this comment

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

the logic based on the spec, so it shouldnt confuse user imo, its a bug

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

@sudiptob2 can you update the comment on L320, and update it so its valid e.g. // Only set Route timeout to BackendRequest when Retries are not set

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Thanks for the review 🚀 Comment updated.

@sudiptob2 sudiptob2 force-pushed the fix/6414/backend-req-timeout branch from 8c9ccf8 to 1931dd3 Compare July 1, 2025 03:51
Copy link
Copy Markdown
Contributor

@arkodg arkodg left a comment

Choose a reason for hiding this comment

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

LGTM thanks

@arkodg arkodg added this to the v1.5.0-rc.1 Release milestone Jul 1, 2025
@arkodg arkodg requested review from a team and rudrakhp July 1, 2025 03:54
@zirain zirain force-pushed the fix/6414/backend-req-timeout branch from 1931dd3 to e3e8555 Compare July 2, 2025 02:39
@zirain zirain enabled auto-merge (squash) July 2, 2025 02:39
@zirain zirain merged commit c95b6bb into envoyproxy:main Jul 2, 2025
28 checks passed
shawnh2 pushed a commit to shawnh2/gateway that referenced this pull request Jul 2, 2025
…y#6421)

* fix: Do not set backendRequestTimeout when Retries are set

Signed-off-by: sudipto baral <[email protected]>

* fix: update comment

Signed-off-by: sudipto baral <[email protected]>

---------

Signed-off-by: sudipto baral <[email protected]>
zhaohuabing added a commit that referenced this pull request Jul 4, 2025
* fix(translator): ext-proc full duplex streamed trailers and validation (#6323)
* fix ext proc validation and trailer management for full duplex streamed mode

Signed-off-by: Guy Daich <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* feat: disable automountServiceAccountToken for proxy and ratelimit (#6364)

Signed-off-by: Jeff Davis <[email protected]>

* bugfix: make EnvoyPatchPolicy able to replace telemetry cluster (#6367)

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* feat: add validation of section name for Gateway listener (#6343)

* add validation of section name

Signed-off-by: kkk777-7 <[email protected]>

* update error status reason

Signed-off-by: kkk777-7 <[email protected]>

* refactor: define as function of validate section name for gateway listener

Signed-off-by: kkk777-7 <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* fix: add configMap indexers for EEP reconciler (#6369)

Signed-off-by: Rudrakh Panigrahi <[email protected]>

* fix: use buildEndpointType for access and tracing (#6370)

Signed-off-by: zirain <[email protected]>

* fix: default accesslog not working (#6441)
* fix default accesslog

Signed-off-by: zirain <[email protected]>

* release notes

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* chore: fix cve (#6446)

* fix cve

Signed-off-by: zirain <[email protected]>

* lint

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>

* fix: Do not set backendRequestTimeout when Retries are set (#6421)

* fix: Do not set backendRequestTimeout when Retries are set

Signed-off-by: sudipto baral <[email protected]>

* fix: update comment

Signed-off-by: sudipto baral <[email protected]>

---------

Signed-off-by: sudipto baral <[email protected]>

* gatewayapi: don't append gwcResource if there's invalid GatewayClass (#6379)

* gatewayapi: don't process gloabal resources when acceptedGateways is 0

Signed-off-by: zirain <[email protected]>

* update

Signed-off-by: zirain <[email protected]>

* fix test

Signed-off-by: zirain <[email protected]>

* don't skip gateways

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* fix testdata

Signed-off-by: shawnh2 <[email protected]>

* fix k8s provider controller

Signed-off-by: shawnh2 <[email protected]>

* fix: retry reconcile on transient errors during reconcile  (#6299)

* fix: add isTransientError helper to classify retryable errors

Introduces isTransientError to detect transient Kubernetes errors and
enable proper reconciliation retries.

Signed-off-by: Patryk Rostkowski <[email protected]>

handle errors from processing BackendRefs

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

handle errors from processing ConfigMap

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* skip invalid GatewayClass

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* address comment

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* handle all transient errors

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* don't skip failed GCs

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

---------

Signed-off-by: Patryk Rostkowski <[email protected]>
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
Co-authored-by: Huabing (Robin) Zhao <[email protected]>
(cherry picked from commit 71ce56f)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* fix: fix bug in hostname overlap detection (#6332)

fix bug in hostname overlap detection

Signed-off-by: Rudrakh Panigrahi <[email protected]>
(cherry picked from commit e78e268)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* fix telemetry with host port not working (#6460)

Signed-off-by: zirain <[email protected]>
(cherry picked from commit c0a2ce7)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* bugfix: BackendTlsPolicy should not reference across namespace (#6309)

* bugfix: BackendTlsPolicy should not reference across namespace

Signed-off-by: zirain <[email protected]>
(cherry picked from commit 9925189)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

---------

Signed-off-by: Guy Daich <[email protected]>
Signed-off-by: shawnh2 <[email protected]>
Signed-off-by: Jeff Davis <[email protected]>
Signed-off-by: zirain <[email protected]>
Signed-off-by: kkk777-7 <[email protected]>
Signed-off-by: Rudrakh Panigrahi <[email protected]>
Signed-off-by: sudipto baral <[email protected]>
Signed-off-by: Patryk Rostkowski <[email protected]>
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
Co-authored-by: Guy Daich <[email protected]>
Co-authored-by: Jeff Davis <[email protected]>
Co-authored-by: zirain <[email protected]>
Co-authored-by: Kota Kimura <[email protected]>
Co-authored-by: Rudrakh Panigrahi <[email protected]>
Co-authored-by: Sudipto Baral <[email protected]>
Co-authored-by: Patryk Rostkowski <[email protected]>
Co-authored-by: Huabing (Robin) Zhao <[email protected]>
shawnh2 added a commit to shawnh2/gateway that referenced this pull request Sep 15, 2025
* fix(translator): ext-proc full duplex streamed trailers and validation (envoyproxy#6323)
* fix ext proc validation and trailer management for full duplex streamed mode

Signed-off-by: Guy Daich <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* feat: disable automountServiceAccountToken for proxy and ratelimit (envoyproxy#6364)

Signed-off-by: Jeff Davis <[email protected]>

* bugfix: make EnvoyPatchPolicy able to replace telemetry cluster (envoyproxy#6367)

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* feat: add validation of section name for Gateway listener (envoyproxy#6343)

* add validation of section name

Signed-off-by: kkk777-7 <[email protected]>

* update error status reason

Signed-off-by: kkk777-7 <[email protected]>

* refactor: define as function of validate section name for gateway listener

Signed-off-by: kkk777-7 <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* fix: add configMap indexers for EEP reconciler (envoyproxy#6369)

Signed-off-by: Rudrakh Panigrahi <[email protected]>

* fix: use buildEndpointType for access and tracing (envoyproxy#6370)

Signed-off-by: zirain <[email protected]>

* fix: default accesslog not working (envoyproxy#6441)
* fix default accesslog

Signed-off-by: zirain <[email protected]>

* release notes

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* chore: fix cve (envoyproxy#6446)

* fix cve

Signed-off-by: zirain <[email protected]>

* lint

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>

* fix: Do not set backendRequestTimeout when Retries are set (envoyproxy#6421)

* fix: Do not set backendRequestTimeout when Retries are set

Signed-off-by: sudipto baral <[email protected]>

* fix: update comment

Signed-off-by: sudipto baral <[email protected]>

---------

Signed-off-by: sudipto baral <[email protected]>

* gatewayapi: don't append gwcResource if there's invalid GatewayClass (envoyproxy#6379)

* gatewayapi: don't process gloabal resources when acceptedGateways is 0

Signed-off-by: zirain <[email protected]>

* update

Signed-off-by: zirain <[email protected]>

* fix test

Signed-off-by: zirain <[email protected]>

* don't skip gateways

Signed-off-by: zirain <[email protected]>

---------

Signed-off-by: zirain <[email protected]>
Signed-off-by: shawnh2 <[email protected]>

* fix testdata

Signed-off-by: shawnh2 <[email protected]>

* fix k8s provider controller

Signed-off-by: shawnh2 <[email protected]>

* fix: retry reconcile on transient errors during reconcile  (envoyproxy#6299)

* fix: add isTransientError helper to classify retryable errors

Introduces isTransientError to detect transient Kubernetes errors and
enable proper reconciliation retries.

Signed-off-by: Patryk Rostkowski <[email protected]>

handle errors from processing BackendRefs

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

handle errors from processing ConfigMap

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* skip invalid GatewayClass

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* address comment

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* handle all transient errors

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* don't skip failed GCs

Signed-off-by: Huabing (Robin) Zhao <[email protected]>

---------

Signed-off-by: Patryk Rostkowski <[email protected]>
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
Co-authored-by: Huabing (Robin) Zhao <[email protected]>
(cherry picked from commit 71ce56f)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* fix: fix bug in hostname overlap detection (envoyproxy#6332)

fix bug in hostname overlap detection

Signed-off-by: Rudrakh Panigrahi <[email protected]>
(cherry picked from commit e78e268)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* fix telemetry with host port not working (envoyproxy#6460)

Signed-off-by: zirain <[email protected]>
(cherry picked from commit c0a2ce7)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

* bugfix: BackendTlsPolicy should not reference across namespace (envoyproxy#6309)

* bugfix: BackendTlsPolicy should not reference across namespace

Signed-off-by: zirain <[email protected]>
(cherry picked from commit 9925189)
Signed-off-by: Huabing (Robin) Zhao <[email protected]>

---------

Signed-off-by: Guy Daich <[email protected]>
Signed-off-by: shawnh2 <[email protected]>
Signed-off-by: Jeff Davis <[email protected]>
Signed-off-by: zirain <[email protected]>
Signed-off-by: kkk777-7 <[email protected]>
Signed-off-by: Rudrakh Panigrahi <[email protected]>
Signed-off-by: sudipto baral <[email protected]>
Signed-off-by: Patryk Rostkowski <[email protected]>
Signed-off-by: Huabing (Robin) Zhao <[email protected]>
Co-authored-by: Guy Daich <[email protected]>
Co-authored-by: Jeff Davis <[email protected]>
Co-authored-by: zirain <[email protected]>
Co-authored-by: Kota Kimura <[email protected]>
Co-authored-by: Rudrakh Panigrahi <[email protected]>
Co-authored-by: Sudipto Baral <[email protected]>
Co-authored-by: Patryk Rostkowski <[email protected]>
Co-authored-by: Huabing (Robin) Zhao <[email protected]>
Signed-off-by: shawnh2 <[email protected]>
@sudiptob2 sudiptob2 deleted the fix/6414/backend-req-timeout branch March 1, 2026 23:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dont set backendRequestTimeout to Request Timeout when Retries are set

4 participants