Skip to content

Commit 0cbd39b

Browse files
authored
CSHARP-5608: CSOT: Command Execution (#1709)
1 parent 5d4827a commit 0cbd39b

File tree

6 files changed

+270
-275
lines changed

6 files changed

+270
-275
lines changed

src/MongoDB.Driver/Core/Clusters/Cluster.cs

Lines changed: 259 additions & 269 deletions
Large diffs are not rendered by default.

src/MongoDB.Driver/Core/Clusters/ServerSelectors/OperationsCountServerSelector.cs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ namespace MongoDB.Driver.Core.Clusters.ServerSelectors
2222
{
2323
internal sealed class OperationsCountServerSelector : IServerSelector
2424
{
25-
private readonly IEnumerable<IClusterableServer> _clusterableServers;
25+
private IReadOnlyList<IClusterableServer> _clusterableServers;
2626

27-
public OperationsCountServerSelector(IEnumerable<IClusterableServer> clusterableServers)
27+
public OperationsCountServerSelector(IReadOnlyList<IClusterableServer> clusterableServers)
2828
{
2929
_clusterableServers = clusterableServers;
3030
}
@@ -58,6 +58,11 @@ public IEnumerable<ServerDescription> SelectServers(ClusterDescription cluster,
5858
}
5959
}
6060

61+
public void PopulateServers(IReadOnlyList<IClusterableServer> clusterableServers)
62+
{
63+
_clusterableServers = clusterableServers;
64+
}
65+
6166
/// <inheritdoc/>
6267
public override string ToString() =>
6368
nameof(OperationsCountServerSelector);

tests/MongoDB.Driver.Tests/Core/Jira/CSharp3173Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ private IServerSelector CreateWritableServerAndEndPointSelector(EndPoint endPoin
289289
private void ForceClusterId(MultiServerCluster cluster, ClusterId clusterId)
290290
{
291291
Reflector.SetFieldValue(cluster, "_clusterId", clusterId);
292-
Reflector.SetFieldValue(cluster, "_descriptionWithChangedTaskCompletionSource", new Cluster.ClusterDescriptionChangeSource(ClusterDescription.CreateInitial(clusterId, __directConnection)));
292+
Reflector.SetFieldValue(cluster, "_expirableClusterDescription", new Cluster.ExpirableClusterDescription(cluster, ClusterDescription.CreateInitial(clusterId, __directConnection)));
293293
}
294294

295295
private void SetupServerMonitorConnection(

tests/MongoDB.Driver.Tests/Core/Jira/CSharp3302Tests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ private IServerSelector CreateWritableServerAndEndPointSelector(EndPoint endPoin
270270
private void ForceClusterId(MultiServerCluster cluster, ClusterId clusterId)
271271
{
272272
Reflector.SetFieldValue(cluster, "_clusterId", clusterId);
273-
Reflector.SetFieldValue(cluster, "_descriptionWithChangedTaskCompletionSource", new Cluster.ClusterDescriptionChangeSource(ClusterDescription.CreateInitial(clusterId, __directConnection)));
273+
Reflector.SetFieldValue(cluster, "_expirableClusterDescription", new Cluster.ExpirableClusterDescription(cluster, ClusterDescription.CreateInitial(clusterId, __directConnection)));
274274
}
275275

276276
private void SetupServerMonitorConnection(

tests/MongoDB.Driver.Tests/Core/Logging/EventLoggerTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ private static IEnumerable<object[]> EventsData()
9494
(new LogCategories.Command(), new CommandStartedEvent("test", new Bson.BsonDocument(), new DatabaseNamespace("test"), 1, 1, connectionId)),
9595
(new LogCategories.Connection(), new ConnectionCreatedEvent(connectionId, null, 1)),
9696
(new LogCategories.SDAM(), new ServerHeartbeatStartedEvent(connectionId, true)),
97-
(new LogCategories.ServerSelection(), new ClusterSelectingServerEvent(clusterDescription, new RandomServerSelector(), default, default))
97+
(new LogCategories.ServerSelection(), new ClusterSelectingServerEvent(clusterDescription, Mock.Of<IServerSelector>(), default, default))
9898
};
9999

100100
var booleanValues = new[] { true, false };

tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ public void BypassSpawningMongocryptdTest(
447447
var exception = Record.Exception(() => adminDatabase.RunCommand<BsonDocument>(legacyHelloCommand));
448448

449449
exception.Should().BeOfType<TimeoutException>();
450-
exception.Message.Should().Contain("A timeout occurred after 1000ms selecting a server").And.Contain("localhost:27021");
450+
exception.Message.Should().MatchRegex(@".*A timeout occurred after \d+ms selecting a server.*").And.Contain("localhost:27021");
451451
}
452452

453453
IMongoClient EnsureEnvironmentAndConfigureTestClientEncrypted()

0 commit comments

Comments
 (0)