Fix HttpTimeoutPolicies to not accidentally suppress retries

Azure · Jun 27, 2023 · d45830c · d45830c
1 parent abab80e
commit d45830c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/HttpClient/HttpTimeoutPolicyControlPlaneRetriableHotPath.cs b/Microsoft.Azure.Cosmos/src/HttpClient/HttpTimeoutPolicyControlPlaneRetriableHotPath.cs
@@ -29,7 +29,7 @@ private HttpTimeoutPolicyControlPlaneRetriableHotPath(bool shouldThrow503OnTimeo
 
         public override string TimeoutPolicyName => HttpTimeoutPolicyControlPlaneRetriableHotPath.Name;
 
-        public override TimeSpan MaximumRetryTimeLimit => CosmosHttpClient.GatewayRequestTimeout;
+        public override TimeSpan MaximumRetryTimeLimit => CosmosHttpClient.GatewayRequestTimeout + TimeSpan.FromSeconds(7.5); // 0.5s + 5 s + 65s + 1s delay + 1s buffer
 
         public override int TotalRetryCount => this.TimeoutsAndDelays.Count;
 

diff --git a/Microsoft.Azure.Cosmos/src/HttpClient/HttpTimeoutPolicyDefault.cs b/Microsoft.Azure.Cosmos/src/HttpClient/HttpTimeoutPolicyDefault.cs
@@ -29,7 +29,7 @@ private HttpTimeoutPolicyDefault(bool shouldThrow503OnTimeout)
 
         public override string TimeoutPolicyName => HttpTimeoutPolicyDefault.Name;
 
-        public override TimeSpan MaximumRetryTimeLimit => CosmosHttpClient.GatewayRequestTimeout;
+        public override TimeSpan MaximumRetryTimeLimit => TimeSpan.FromSeconds((3 * CosmosHttpClient.GatewayRequestTimeout.TotalSeconds) + 1); // 3 times 65s + 1s delay + 1s buffer
 
         public override int TotalRetryCount => this.TimeoutsAndDelays.Count;