PartitionRoutingHelper: Fix ReadFeed ArgumentNullException due to con…

…tainer cache miss (#1512) * Test commit to treat null as missing info. * UT asserting the resolvedRangeInfo with null values * Marking missing routing map as warning * reverting unnecessary change * Using named parameters
Azure · May 15, 2020 · 46e8aca · 46e8aca
1 parent 3900d22
commit 46e8aca
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/Microsoft.Azure.Cosmos/src/Routing/PartitionKeyRangeCache.cs b/Microsoft.Azure.Cosmos/src/Routing/PartitionKeyRangeCache.cs
@@ -57,7 +57,7 @@ public virtual async Task<IReadOnlyList<PartitionKeyRange>> TryGetOverlappingRan
 
             if (routingMap == null)
             {
-                DefaultTrace.TraceInformation(string.Format("Routing Map Null for collection: {0} for range: {1}, forceRefresh:{2}", collectionRid, range.ToString(), forceRefresh));
+                DefaultTrace.TraceWarning(string.Format("Routing Map Null for collection: {0} for range: {1}, forceRefresh:{2}", collectionRid, range.ToString(), forceRefresh));
                 return null;
             }
 

diff --git a/Microsoft.Azure.Cosmos/src/Routing/PartitionRoutingHelper.cs b/Microsoft.Azure.Cosmos/src/Routing/PartitionRoutingHelper.cs
@@ -6,6 +6,7 @@ namespace Microsoft.Azure.Cosmos.Routing
 {
     using System;
     using System.Collections.Generic;
+    using System.Collections.ObjectModel;
     using System.Diagnostics;
     using System.Globalization;
     using System.Linq;
@@ -228,7 +229,10 @@ await routingMapProvider.TryGetRangeByEffectivePartitionKeyAsync(collectionRid,
             if (!rangeFromContinuationToken.Equals(targetPartitionKeyRange.ToRange()))
             {
                 // Cannot find target range. Either collection was resolved incorrectly or the range was split
-                List<PartitionKeyRange> replacedRanges = (await routingMapProvider.TryGetOverlappingRangesAsync(collectionRid, rangeFromContinuationToken, true)).ToList();
+                IReadOnlyList<PartitionKeyRange> replacedRanges = await routingMapProvider.TryGetOverlappingRangesAsync(
+                        collectionResourceId: collectionRid,
+                        range: rangeFromContinuationToken,
+                        forceRefresh: true);
 
                 if (replacedRanges == null || replacedRanges.Count < 1)
                 {
@@ -244,7 +248,7 @@ await routingMapProvider.TryGetRangeByEffectivePartitionKeyAsync(collectionRid,
 
                 if (direction == RntdbEnumerationDirection.Reverse)
                 {
-                    replacedRanges.Reverse();
+                    replacedRanges = new ReadOnlyCollection<PartitionKeyRange>(replacedRanges.Reverse().ToList());
                 }
 
                 List<CompositeContinuationToken> continuationTokensToBePersisted = null;

diff --git a/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/PartitionKeyRangeHandlerTests.cs b/Microsoft.Azure.Cosmos/tests/Microsoft.Azure.Cosmos.Tests/PartitionKeyRangeHandlerTests.cs
@@ -218,6 +218,52 @@ public async Task GetTargetRangeFromContinuationTokenWhenNotEmpty()
             routingMapProvider.Verify();
         }
 
+        [TestMethod]
+        public async Task GetTargetRangeFromContinuationTokenNonExistentContainer()
+        {
+            List<Range<string>> providedRanges = new List<Range<string>> {
+                    new Range<string>(
+                        PartitionKeyInternal.MinimumInclusiveEffectivePartitionKey,
+                        PartitionKeyInternal.MaximumExclusiveEffectivePartitionKey,
+                        isMinInclusive: true,
+                        isMaxInclusive: false)
+                };
+
+            //Not empty
+            Range<string> range = new Range<string>("A", "B", true, false);
+            List<CompositeContinuationToken> suppliedTokens = new List<CompositeContinuationToken>
+                {
+                    new CompositeContinuationToken{ Range = range }
+                };
+
+            IReadOnlyList<PartitionKeyRange> overlappingRanges = new List<PartitionKeyRange> {
+                new PartitionKeyRange { Id = "0", MinInclusive = "A", MaxExclusive = "B" },
+                new PartitionKeyRange { Id = "1", MinInclusive = "B", MaxExclusive = "C" }
+            }.AsReadOnly();
+
+            Mock<IRoutingMapProvider> routingMapProvider = new Mock<IRoutingMapProvider>();
+            routingMapProvider
+                .SetupSequence(m => m.TryGetOverlappingRangesAsync(
+                    It.IsAny<string>(),
+                    It.Is<Range<string>>(x => x.Min == range.Min),
+                    It.IsAny<bool>()))
+                .Returns(Task.FromResult((IReadOnlyList<PartitionKeyRange>)overlappingRanges.Skip(1).ToList()))
+                .Returns(Task.FromResult((IReadOnlyList<PartitionKeyRange>)null));
+
+            PartitionRoutingHelper partitionRoutingHelper = new PartitionRoutingHelper();
+            ResolvedRangeInfo resolvedRangeInfo = await partitionRoutingHelper.TryGetTargetRangeFromContinuationTokenRangeAsync(
+                providedRanges,
+                routingMapProvider.Object,
+                CollectionId,
+                range,
+                suppliedTokens,
+                RntdbEnumerationDirection.Reverse);
+
+            Assert.IsNotNull(resolvedRangeInfo);
+            Assert.IsNull(resolvedRangeInfo.ResolvedRange);
+            Assert.IsNull(resolvedRangeInfo.ContinuationTokens);
+        }
+
         [TestMethod]
         public async Task GetTargetRangeFromContinuationTokenOnSplit()
         {