HttpTimeoutPolicy Improvements Phase 3: Fixes the TimeoutPolicies to Have Segregated Timeouts for Point-Reads and Non-Point-Reads with Uniform Timeouts

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

@@ -20,13 +20,13 @@ private HttpTimeoutPolicyForPartitionFailover(bool isPointRead)
         }
 
         // Timeouts and delays are based on the following rationale:
-        // For point reads: 3 attempts with timeouts of 1s, 6s, and 6s respectively.
+        // For point reads: 3 attempts with timeouts of 6s, 6s, and 10s respectively.
         // For non-point reads: 3 attempts with timeouts of 6s, 6s, and 10s respectively.
         private readonly IReadOnlyList<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)> TimeoutsAndDelaysForPointReads = new List<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)>()
         {
-            (TimeSpan.FromSeconds(1), TimeSpan.Zero),
             (TimeSpan.FromSeconds(6), TimeSpan.Zero),
             (TimeSpan.FromSeconds(6), TimeSpan.Zero),
+            (TimeSpan.FromSeconds(10), TimeSpan.Zero),
         };
 
         private readonly IReadOnlyList<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)> TimeoutsAndDelaysForNonPointReads = new List<(TimeSpan requestTimeout, TimeSpan delayForNextRequest)>()

Microsoft.Azure.Cosmos/src/Util/ConfigurationManager.cs

@@ -123,7 +123,7 @@ internal static class ConfigurationManager
         /// By default length aware range comparator is enabled. Refer to Range.cs in Msdata project for more details. Range.LengthAwareMinComparer/LengthAwareMaxComparer.
         /// Setting the value to false will disable length aware range comparator and switch to using the regular Range.MinComparer/MaxComparer.
         /// </summary>
-        internal static readonly string UseLengthAwareRangeComparator = "AZURE_COSMOS_USE_LENGTH_AWARE_RANGE_COMPARATOR";
+        internal static readonly string UseLengthAwareRangeComparator = "AZURE_COSMOS_USE_LENGTH_AWARE_RANGE_COMPARATOR";
 
         public static T GetEnvironmentVariable<T>(string variable, T defaultValue)
         {

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

@@ -628,13 +628,13 @@ public void HttpTimeoutPolicyForParitionFailoverForReads()
             int count = 0;
             while (availableRetries.MoveNext())
             {
-                if (count == 0)
+                if (count <= 1)
                 {
-                    Assert.AreEqual(new TimeSpan(0, 0, 1), availableRetries.Current.requestTimeout);
+                    Assert.AreEqual(new TimeSpan(0, 0, 6), availableRetries.Current.requestTimeout);
                 }
-                else if (count == 1 || count ==2 )
+                else if (count == 2)
                 {
-                    Assert.AreEqual(new TimeSpan(0, 0, 6), availableRetries.Current.requestTimeout);
+                    Assert.AreEqual(new TimeSpan(0, 0, 10), availableRetries.Current.requestTimeout);
                 }
                 count++;
             }