CSHARP-4017: Fix flaky Aggregate_with__out_includes_read_preference_for_5.0__server error (#1391)

sanych-sun · web-flow · commit 46f39d58fdb7 · 2024-07-18T08:58:06.000-07:00
diff --git a/src/MongoDB.Driver.Core/Core/Clusters/ServerSelectors/WritableServerSelector.cs b/src/MongoDB.Driver.Core/Core/Clusters/ServerSelectors/WritableServerSelector.cs
@@ -98,7 +98,7 @@ public override string ToString()
 
         private bool CanUseSecondaries(ClusterDescription cluster, List<ServerDescription> servers)
         {
-            if (_mayUseSecondary?.ReadPreference == null || servers.Count == 0)
+            if (_mayUseSecondary?.ReadPreference == null)
             {
                 return false;
             }
@@ -107,6 +107,11 @@ private bool CanUseSecondaries(ClusterDescription cluster, List<ServerDescriptio
             {
                 case ClusterType.ReplicaSet:
                 case ClusterType.Sharded:
+                    if (servers.Count == 0)
+                    {
+                        return true;
+                    }
+
                     return servers.All(s => _mayUseSecondary.CanUseSecondary(s));
 
                 case ClusterType.LoadBalanced:
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/CompositeServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/CompositeServerSelectorTests.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2013-present MongoDB Inc.
+﻿/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/DelegateServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/DelegateServerSelectorTests.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2013-present MongoDB Inc.
+﻿/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/EndPointServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/EndPointServerSelectorTests.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2013-present MongoDB Inc.
+﻿/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/LatencyLimitingServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/LatencyLimitingServerSelectorTests.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2013-present MongoDB Inc.
+﻿/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/RandomServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/RandomServerSelectorTests.cs
@@ -1,4 +1,4 @@
-﻿/* Copyright 2013-present MongoDB Inc.
+﻿/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/ReadPreferenceServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/ReadPreferenceServerSelectorTests.cs
@@ -1,4 +1,4 @@
-/* Copyright 2013-present MongoDB Inc.
+/* Copyright 2010-present MongoDB Inc.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
diff --git a/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/WritableServerSelectorTests.cs b/tests/MongoDB.Driver.Core.Tests/Core/Clusters/ServerSelectors/WritableServerSelectorTests.cs
@@ -0,0 +1,116 @@
+﻿/* Copyright 2010-present MongoDB Inc.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+
+using System;
+using System.Collections.Generic;
+using System.Net;
+using FluentAssertions;
+using MongoDB.Driver.Core.Bindings;
+using MongoDB.Driver.Core.Helpers;
+using MongoDB.Driver.Core.Misc;
+using MongoDB.Driver.Core.Operations;
+using MongoDB.Driver.Core.Servers;
+using Xunit;
+
+namespace MongoDB.Driver.Core.Clusters.ServerSelectors
+{
+    public class WritableServerSelectorTests
+    {
+        [Theory]
+        [MemberData(nameof(ReplicaSetTestCases))]
+        public void WritableServerSelector_should_work(
+            ReadPreference readPreference,
+            ClusterDescription cluster,
+            ReadPreference expectedReadPreference,
+            IEnumerable<ServerDescription> expectedServers)
+        {
+            IMayUseSecondaryCriteria mayUseSecondary = null;
+            if (readPreference != null)
+            {
+                mayUseSecondary = new AggregateToCollectionOperation.MayUseSecondary(readPreference);
+            }
+
+            var selector = new WritableServerSelector(mayUseSecondary);
+            var results = selector.SelectServers(cluster, cluster.Servers);
+
+            results.Should().BeEquivalentTo(expectedServers);
+            if (readPreference != null)
+            {
+                selector.MayUseSecondary.EffectiveReadPreference.Should().Be(expectedReadPreference);
+            }
+        }
+
+        public static IEnumerable<object[]> ReplicaSetTestCases()
+        {
+            var clusterId = new ClusterId();
+            var primary = ServerDescriptionHelper.Connected(clusterId, new DnsEndPoint("localhost", 27017), ServerType.ReplicaSetPrimary, wireVersionRange: new Range<int>(WireVersion.Server70, WireVersion.Server70));
+            var secondary1Server70 = ServerDescriptionHelper.Connected(clusterId, new DnsEndPoint("localhost", 27018), ServerType.ReplicaSetSecondary, wireVersionRange: new Range<int>(WireVersion.Server70, WireVersion.Server70));
+            var secondary2Server70 = ServerDescriptionHelper.Connected(clusterId, new DnsEndPoint("localhost", 27019), ServerType.ReplicaSetSecondary, wireVersionRange: new Range<int>(WireVersion.Server70, WireVersion.Server70));
+            var secondary3Server42 = ServerDescriptionHelper.Connected(clusterId, new DnsEndPoint("localhost", 27020), ServerType.ReplicaSetSecondary, wireVersionRange: new Range<int>(WireVersion.Server42, WireVersion.Server42));
+
+            yield return new object[]
+            {
+                ReadPreference.SecondaryPreferred,
+                new ClusterDescription(
+                    clusterId,
+                    false,
+                    null,
+                    ClusterType.ReplicaSet,
+                    Array.Empty<ServerDescription>()),
+                ReadPreference.SecondaryPreferred,
+                Array.Empty<ServerDescription>()
+            };
+
+            yield return new object[]
+            {
+                ReadPreference.SecondaryPreferred,
+                new ClusterDescription(
+                    clusterId,
+                    false,
+                    null,
+                    ClusterType.ReplicaSet,
+                    new[] { primary }),
+                ReadPreference.SecondaryPreferred,
+                new[] { primary }
+            };
+
+            yield return new object[]
+            {
+                ReadPreference.SecondaryPreferred,
+                new ClusterDescription(
+                    clusterId,
+                    false,
+                    null,
+                    ClusterType.ReplicaSet,
+                    new[] { primary, secondary1Server70, secondary2Server70 }),
+                ReadPreference.SecondaryPreferred,
+                new[] { secondary1Server70, secondary2Server70 }
+            };
+
+            yield return new object[]
+            {
+                ReadPreference.SecondaryPreferred,
+                new ClusterDescription(
+                    clusterId,
+                    false,
+                    null,
+                    ClusterType.ReplicaSet,
+                    new[] { primary, secondary1Server70, secondary2Server70, secondary3Server42 }),
+                ReadPreference.Primary,
+                new[] { primary }
+            };
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public override string ToString()`
`98`	`98`
`99`	`99`	`private bool CanUseSecondaries(ClusterDescription cluster, List<ServerDescription> servers)`
`100`	`100`	`{`
`101`		`- if (_mayUseSecondary?.ReadPreference == null \|\| servers.Count == 0)`
	`101`	`+ if (_mayUseSecondary?.ReadPreference == null)`
`102`	`102`	`{`
`103`	`103`	`return false;`
`104`	`104`	`}`
`@@ -107,6 +107,11 @@ private bool CanUseSecondaries(ClusterDescription cluster, List<ServerDescriptio`
`107`	`107`	`{`
`108`	`108`	`case ClusterType.ReplicaSet:`
`109`	`109`	`case ClusterType.Sharded:`
	`110`	`+ if (servers.Count == 0)`
	`111`	`+ {`
	`112`	`+ return true;`
	`113`	`+ }`
	`114`	`+`
`110`	`115`	`return servers.All(s => _mayUseSecondary.CanUseSecondary(s));`
`111`	`116`
`112`	`117`	`case ClusterType.LoadBalanced:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-/* Copyright 2013-present MongoDB Inc.`
	`1`	`+/* Copyright 2010-present MongoDB Inc.`
`2`	`2`	`*`
`3`	`3`	`* Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`* you may not use this file except in compliance with the License.`