Update the safe retry to use address resource type as well.

Author: Praveen-Msft

Microsoft.Azure.Cosmos/src/HttpClient/CosmosHttpClientCore.cs

@@ -415,7 +415,7 @@ private async Task<HttpResponseMessage> SendHttpHelperAsync(
 
                                 // Convert OperationCanceledException to 408 when the HTTP client throws it. This makes it clear that the 
                                 // the request timed out and was not user canceled operation.
-                                if (isOutOfRetries || !documentServiceRequest.IsReadOnlyRequest)
+                                if (isOutOfRetries || !IsSafeToRetry(documentServiceRequest))
                                 {
                                     // throw current exception (caught in transport handler)
                                     string message =
@@ -440,14 +440,14 @@ private async Task<HttpResponseMessage> SendHttpHelperAsync(
 
                                 break;
                             case WebException webException:
-                                if (isOutOfRetries || (!documentServiceRequest.IsReadOnlyRequest && !WebExceptionUtility.IsWebExceptionRetriable(webException)))
+                                if (isOutOfRetries || (!IsSafeToRetry(documentServiceRequest) && !WebExceptionUtility.IsWebExceptionRetriable(webException)))
                                 {
                                     throw;
                                 }
 
                                 break;
                             case HttpRequestException httpRequestException:
-                                if (isOutOfRetries || !documentServiceRequest.IsReadOnlyRequest)
+                                if (isOutOfRetries || !IsSafeToRetry(documentServiceRequest))
                                 {
                                     throw;
                                 }
@@ -498,6 +498,15 @@ private static bool IsOutOfRetries(
             return !timeoutEnumerator.MoveNext(); // No more retries are configured
         }
 
+        private static bool IsSafeToRetry(DocumentServiceRequest documentServiceRequest)
+        {
+            if (documentServiceRequest == null)
+            {
+                return false;
+            }
+            return documentServiceRequest.IsReadOnlyRequest || documentServiceRequest.ResourceType == ResourceType.Address;
+        }
+
         private async Task<HttpResponseMessage> ExecuteHttpHelperAsync(
             HttpRequestMessage requestMessage,
             ResourceType resourceType,

Microsoft.Azure.Cosmos/src/HttpClient/HttpTimeoutPolicyForPartitionFailover.cs

@@ -21,9 +21,9 @@ private HttpTimeoutPolicyForPartitionFailover(bool shouldThrow503OnTimeout)
 
         private readonly IReadOnlyList<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)> TimeoutsAndDelays = new List<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)>()
         {
+            (TimeSpan.FromSeconds(.5), TimeSpan.Zero),
             (TimeSpan.FromSeconds(.5), TimeSpan.Zero),
             (TimeSpan.FromSeconds(1), TimeSpan.Zero),
-            (TimeSpan.FromSeconds(5), TimeSpan.Zero),
         };
 
         public override string TimeoutPolicyName => HttpTimeoutPolicyForPartitionFailover.Name;

Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/GatewayStoreModelTest.cs

@@ -889,15 +889,22 @@ public async Task GatewayStatsDurationTest()
                                                                                     DocumentClientEventSource.Instance);
 
             using (ITrace trace = Tracing.Trace.GetRootTrace(nameof(GatewayStatsDurationTest)))
-            {
-
+            {
+
                 Tracing.TraceData.ClientSideRequestStatisticsTraceDatum clientSideRequestStatistics = new Tracing.TraceData.ClientSideRequestStatisticsTraceDatum(DateTime.UtcNow, trace);
 
                 await cosmosHttpClient.SendHttpAsync(() => new ValueTask<HttpRequestMessage>(new HttpRequestMessage(HttpMethod.Get, "http://someuri.com")),
                                                       ResourceType.Document,
                                                       HttpTimeoutPolicyDefault.InstanceShouldThrow503OnTimeout,
                                                       clientSideRequestStatistics,
-                                                      CancellationToken.None);
+                                                      CancellationToken.None,
+                                                      documentServiceRequest: new DocumentServiceRequest(
+                                                                                OperationType.Read,
+                                                                                ResourceType.Document,
+                                                                                $"dbs/dummy_db_id/colls/dummy_ct_id",
+                                                                                body: null,
+                                                                                AuthorizationTokenType.PrimaryMasterKey,
+                                                                                headers: null));
 
                 Assert.AreEqual(clientSideRequestStatistics.HttpResponseStatisticsList.Count, 2);
                 // The duration is calculated using date times which can cause the duration to be slightly off. This allows for up to 15 Ms of variance.