HttpTimeoutPolicy Improvements Phase 1: Fixes QueryPlan requests retry gaps #5476
Conversation
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
…ype and operation type.
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
FabianMeiswinkel
requested changes
Nov 6, 2025
kundadebdatta
changed the title
DocumentServiceRequest Using Resource and Operation Type
kundadebdatta
requested review from
Pilchie,
adityasa,
khdang,
kirillg,
neildsh and
sboshra
as code owners
Contributor
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the retry safety determination logic from using HTTP method-based checks to using DocumentServiceRequest-based checks. The primary purpose is to consolidate retry logic by moving the IsSafeToRetry decision from individual timeout policy classes to a centralized implementation in CosmosHttpClientCore that considers the request's properties.
Key changes:
- Removed the abstract
IsSafeToRetry(HttpMethod)method fromHttpTimeoutPolicyand all its implementations - Added a new static
IsSafeToRetry(DocumentServiceRequest)method inCosmosHttpClientCorethat determines retry safety based on request properties - Updated test files to pass
documentServiceRequestparameter andOperationTypeto support the new retry logic
Reviewed Changes
Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.
Show a summary per file
| File | Description |
|---|---|
| HttpTimeoutPolicy.cs | Removed abstract IsSafeToRetry(HttpMethod) method declaration |
| HttpTimeoutPolicyNoRetry.cs | Removed IsSafeToRetry implementation |
| HttpTimeoutPolicyForThinClient.cs | Removed IsSafeToRetry method and updated to use shouldRetry field directly |
| HttpTimeoutPolicyForPartitionFailover.cs | Removed IsSafeToRetry implementation |
| HttpTimeoutPolicyDefault.cs | Removed IsSafeToRetry implementation |
| HttpTimeoutPolicyControlPlaneRetriableHotPath.cs | Removed IsSafeToRetry implementation and related check |
| HttpTimeoutPolicyControlPlaneRead.cs | Removed IsSafeToRetry implementation |
| CosmosHttpClientCore.cs | Added new IsSafeToRetry(DocumentServiceRequest) method, updated retry logic to use it, simplified IsOutOfRetries signature |
| GatewayStoreModelTest.cs | Updated test to pass documentServiceRequest parameter |
| CosmosHttpClientCoreTests.cs | Added OperationType parameter to test scenarios and updated all test calls |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
@microsoft-github-policy-service agree company="Microsoft" |
kundadebdatta
changed the title
DocumentServiceRequest Using Resource and Operation TypeDocumentServiceRequest Using Resource and Operation Type
kundadebdatta
changed the title
DocumentServiceRequest Using Resource and Operation TypeIsSafeToRetry() Method Out of Individual Timeout Policies
kundadebdatta
previously approved these changes
Nov 7, 2025
FabianMeiswinkel
previously approved these changes
Nov 7, 2025
Member
FabianMeiswinkel
left a comment
FabianMeiswinkel
left a comment
There was a problem hiding this comment.
Few NITs - otherwise LGTM now. Thanks!
Member
|
Please enhance PR description
|
Praveen-Msft
changed the title
IsSafeToRetry() Method Out of Individual Timeout PoliciesIsSafeToRetry() Method behavior based on the OperationType and ResourceType
Praveen-Msft
changed the title
IsSafeToRetry() Method behavior based on the OperationType and ResourceTypeIsSafeToRetry() method behavior based on the OperationType and ResourceType
Praveen-Msft
changed the title
IsSafeToRetry() method behavior based on the OperationType and ResourceType
Praveen-Msft
dismissed stale reviews from FabianMeiswinkel, kundadebdatta, and kirankumarkolli
via
07178e2
kundadebdatta
approved these changes
Nov 7, 2025
microsoft-github-policy-service
bot
deleted the
fix-retry-for-http-timeout-policies
branch
Praveen-Msft
added a commit
that referenced
this pull request
Nov 13, 2025
…y gaps (#5476) # Pull Request Template ## Description This PR fixes: 1. Allow QueryPlan requests to do local retries (within region), before doing cross regional retries. 2. Removing dependency on HttpMethod based retry, Enable all `GET` calls without `DocumentServiceRequest` to retry. 3. Enable caller (CosmosHttpClientCore) to determine when to retry safely. Additional details on the updates in this PR: Allow Retries in following cases: - When `DocumentServiceRequest` is null - If the DocumentServiceRequest's ResourceType is Address - If the DocumentServiceRequest is a ReadOnlyRequest (based on existing criteria). **Follow up**: Another PR will include enhancing/adjusting the defined timeouts on `HttpTimeoutPolicyForPartitionFailover` and potentially `HttpTimeoutPolicyForThinClient` ## Type of change Please delete options that are not relevant. - [x] Bug fix (non-breaking change which fixes an issue) ## Closing issues To automatically close an issue: closes #5481 --------- Co-authored-by: Debdatta Kunda <[email protected]>
This was referenced Nov 29, 2025
Merged
This was referenced Dec 8, 2025
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.
Pull Request Template
Description
This PR fixes:
GETcalls withoutDocumentServiceRequestto retry.Additional details on the updates in this PR:
Allow Retries in following cases:
DocumentServiceRequestis nullFollow up:
Another PR will include enhancing/adjusting the defined timeouts on
HttpTimeoutPolicyForPartitionFailoverand potentiallyHttpTimeoutPolicyForThinClientType of change
Please delete options that are not relevant.
Closing issues
To automatically close an issue: closes #5481