Skip to content

Commit 51dbb28

Browse files
BorisDogBorisDog
authored
CSHARP-4643: Fix some of flaky CMAP tests (allow non static ConnectionID generation) (#1625)
1 parent 11bc211 commit 51dbb28

File tree

10 files changed

+75
-45
lines changed

10 files changed

+75
-45
lines changed

‎src/MongoDB.Driver/ClusterRegistry.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ private ConnectionSettings ConfigureConnection(ConnectionSettings settings, Clus
118118
authenticatorFactory = new AuthenticatorFactory(() => clusterKey.Credential.ToAuthenticator(endPoints, clusterKey.ServerApi));
119119
}
120120

121-
return settings.With(
121+
return settings.WithInternal(
122122
authenticatorFactory: Optional.Create(authenticatorFactory),
123123
compressors: Optional.Enumerable(clusterKey.Compressors),
124124
libraryInfo: clusterKey.LibraryInfo,

‎src/MongoDB.Driver/Core/Configuration/ClusterBuilder.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ private ServerFactory CreateServerFactory()
245245
private IServerMonitorFactory CreateServerMonitorFactory()
246246
{
247247
var serverMonitorConnectionSettings = _connectionSettings
248-
.With(authenticatorFactory: null);
248+
.WithInternal(authenticatorFactory: null);
249249

250250
var heartbeatConnectTimeout = _tcpStreamSettings.ConnectTimeout;
251251
if (heartbeatConnectTimeout == TimeSpan.Zero || heartbeatConnectTimeout == Timeout.InfiniteTimeSpan)

‎src/MongoDB.Driver/Core/Configuration/ClusterBuilderExtensions.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public static ClusterBuilder ConfigureWithConnectionString(
147147
if (connectionString.Username != null)
148148
{
149149
var authenticatorFactory = new AuthenticatorFactory(() => CreateAuthenticator(connectionString, serverApi));
150-
builder = builder.ConfigureConnection(s => s.With(authenticatorFactory: authenticatorFactory));
150+
builder = builder.ConfigureConnection(s => s.WithInternal(authenticatorFactory: authenticatorFactory));
151151
}
152152
if (connectionString.ApplicationName != null)
153153
{

‎src/MongoDB.Driver/Core/Configuration/ConnectionSettings.cs‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
using System.Collections.Generic;
1818
using System.Linq;
1919
using MongoDB.Driver.Authentication;
20+
using MongoDB.Driver.Core.Connections;
2021
using MongoDB.Driver.Core.Misc;
2122

2223
namespace MongoDB.Driver.Core.Configuration
@@ -30,6 +31,7 @@ public class ConnectionSettings
3031
private readonly string _applicationName;
3132
private readonly IAuthenticatorFactory _authenticatorFactory;
3233
private readonly IReadOnlyList<CompressorConfiguration> _compressors;
34+
private readonly Func<long> _connectionIdLocalValueProvider;
3335
private readonly LibraryInfo _libraryInfo;
3436
private readonly bool _loadBalanced;
3537
private readonly TimeSpan _maxIdleTime;
@@ -54,6 +56,7 @@ public ConnectionSettings(
5456
Optional<string> applicationName = default(Optional<string>))
5557
{
5658
_compressors = Ensure.IsNotNull(compressors.WithDefault(Enumerable.Empty<CompressorConfiguration>()), nameof(compressors)).ToList();
59+
_connectionIdLocalValueProvider = LongIdGenerator<ConnectionId>.GetNextId;
5760
_libraryInfo = libraryInfo.WithDefault(null);
5861
_loadBalanced = loadBalanced.WithDefault(false);
5962
_maxIdleTime = Ensure.IsGreaterThanZero(maxIdleTime.WithDefault(TimeSpan.FromMinutes(10)), "maxIdleTime");
@@ -63,15 +66,17 @@ public ConnectionSettings(
6366

6467
internal ConnectionSettings(
6568
IAuthenticatorFactory authenticatorFactory,
66-
Optional<IEnumerable<CompressorConfiguration>> compressors = default(Optional<IEnumerable<CompressorConfiguration>>),
69+
Optional<IEnumerable<CompressorConfiguration>> compressors = default,
70+
Optional<Func<long>> connectionIdLocalValueProvider = default,
6771
Optional<LibraryInfo> libraryInfo = default,
6872
Optional<bool> loadBalanced = default,
69-
Optional<TimeSpan> maxIdleTime = default(Optional<TimeSpan>),
70-
Optional<TimeSpan> maxLifeTime = default(Optional<TimeSpan>),
71-
Optional<string> applicationName = default(Optional<string>))
73+
Optional<TimeSpan> maxIdleTime = default,
74+
Optional<TimeSpan> maxLifeTime = default,
75+
Optional<string> applicationName = default)
7276
{
7377
_authenticatorFactory = authenticatorFactory;
7478
_compressors = Ensure.IsNotNull(compressors.WithDefault(Enumerable.Empty<CompressorConfiguration>()), nameof(compressors)).ToList();
79+
_connectionIdLocalValueProvider = connectionIdLocalValueProvider.WithDefault(LongIdGenerator<ConnectionId>.GetNextId);
7580
_libraryInfo = libraryInfo.WithDefault(null);
7681
_loadBalanced = loadBalanced.WithDefault(false);
7782
_maxIdleTime = Ensure.IsGreaterThanZero(maxIdleTime.WithDefault(TimeSpan.FromMinutes(10)), "maxIdleTime");
@@ -113,6 +118,14 @@ public IReadOnlyList<CompressorConfiguration> Compressors
113118
get { return _compressors; }
114119
}
115120

121+
/// <summary>
122+
/// Gets the connection identifier provider.
123+
/// </summary>
124+
internal Func<long> ConnectionIdLocalValueProvider
125+
{
126+
get { return _connectionIdLocalValueProvider; }
127+
}
128+
116129
/// <summary>
117130
/// Information about a library using the .NET driver.
118131
/// </summary>
@@ -180,29 +193,20 @@ public ConnectionSettings With(
180193
applicationName: applicationName.WithDefault(_applicationName));
181194
}
182195

183-
/// <summary>
184-
/// Returns a new ConnectionSettings instance with some settings changed.
185-
/// </summary>
186-
/// <param name="authenticatorFactory">The authenticator factories.</param>
187-
/// <param name="compressors">The compressors.</param>
188-
/// <param name="libraryInfo">The library information.</param>
189-
/// <param name="loadBalanced">Whether the load balanced mode is enabled.</param>
190-
/// <param name="maxIdleTime">The maximum idle time.</param>
191-
/// <param name="maxLifeTime">The maximum life time.</param>
192-
/// <param name="applicationName">The application name.</param>
193-
/// <returns>A new ConnectionSettings instance.</returns>
194-
internal ConnectionSettings With(
195-
Optional<IAuthenticatorFactory> authenticatorFactory,
196-
Optional<IEnumerable<CompressorConfiguration>> compressors = default(Optional<IEnumerable<CompressorConfiguration>>),
196+
internal ConnectionSettings WithInternal(
197+
Optional<IAuthenticatorFactory> authenticatorFactory = default,
198+
Optional<IEnumerable<CompressorConfiguration>> compressors = default,
199+
Optional<Func<long>> connectionIdLocalValueProvider = default,
197200
Optional<LibraryInfo> libraryInfo = default,
198201
Optional<bool> loadBalanced = default,
199-
Optional<TimeSpan> maxIdleTime = default(Optional<TimeSpan>),
200-
Optional<TimeSpan> maxLifeTime = default(Optional<TimeSpan>),
201-
Optional<string> applicationName = default(Optional<string>))
202+
Optional<TimeSpan> maxIdleTime = default,
203+
Optional<TimeSpan> maxLifeTime = default,
204+
Optional<string> applicationName = default)
202205
{
203206
return new ConnectionSettings(
204207
authenticatorFactory: authenticatorFactory.WithDefault(_authenticatorFactory),
205208
compressors: Optional.Enumerable(compressors.WithDefault(_compressors)),
209+
connectionIdLocalValueProvider: connectionIdLocalValueProvider.WithDefault(_connectionIdLocalValueProvider),
206210
libraryInfo: libraryInfo.WithDefault(_libraryInfo),
207211
loadBalanced: loadBalanced.WithDefault(_loadBalanced),
208212
maxIdleTime: maxIdleTime.WithDefault(_maxIdleTime),

‎src/MongoDB.Driver/Core/Connections/BinaryConnection.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
*/
1515

1616
using System;
17+
using System.Buffers.Binary;
1718
using System.Collections.Concurrent;
1819
using System.Collections.Generic;
1920
using System.Diagnostics;
@@ -22,7 +23,6 @@
2223
using System.Net;
2324
using System.Threading;
2425
using System.Threading.Tasks;
25-
using System.Buffers.Binary;
2626
using Microsoft.Extensions.Logging;
2727
using MongoDB.Bson.IO;
2828
using MongoDB.Driver.Authentication;
@@ -79,7 +79,7 @@ public BinaryConnection(ServerId serverId,
7979
_connectionInitializer = Ensure.IsNotNull(connectionInitializer, nameof(connectionInitializer));
8080
Ensure.IsNotNull(eventSubscriber, nameof(eventSubscriber));
8181

82-
_connectionId = new ConnectionId(serverId);
82+
_connectionId = new ConnectionId(serverId, settings.ConnectionIdLocalValueProvider());
8383
_receiveLock = new SemaphoreSlim(1);
8484
_sendLock = new SemaphoreSlim(1);
8585
_state = new InterlockedInt32(State.Initial);

‎tests/MongoDB.Driver.TestHelpers/Core/MockConnection.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public MockConnection()
6060
public MockConnection(ServerId serverId, ConnectionSettings connectionSettings, IEventSubscriber eventSubscriber, TaskCompletionSource<bool> isExpiredTaskCompletionSource = null)
6161
: this(new ConnectionId(serverId), connectionSettings, eventSubscriber, isExpiredTaskCompletionSource)
6262
{
63-
6463
}
6564

6665
public MockConnection(ConnectionId connectionId, ConnectionSettings connectionSettings, IEventSubscriber eventSubscriber, TaskCompletionSource<bool> isExpiredTaskCompletionSource = null)

‎tests/MongoDB.Driver.Tests/Core/Configuration/ClusterBuilderTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void CreateServerMonitorFactory_should_return_expected_result(int connect
4343
var expectedServerMonitorSocketTimeout = TimeSpan.FromMilliseconds(expectedServerMonitorSocketTimeoutMilliseconds);
4444
var subject = new ClusterBuilder()
4545
.ConfigureTcp(s => s.With(connectTimeout: connectTimeout))
46-
.ConfigureConnection(s => s.With(authenticatorFactory: authenticatorFactory))
46+
.ConfigureConnection(s => s.WithInternal(authenticatorFactory: authenticatorFactory))
4747
.ConfigureServer(s => s.With(heartbeatTimeout: heartbeatTimeout, serverMonitoringMode: serverMonitoringMode));
4848

4949
var result = (ServerMonitorFactory)subject.CreateServerMonitorFactory();

‎tests/MongoDB.Driver.Tests/Core/Configuration/ConnectionSettingsTests.cs‎

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace MongoDB.Driver.Core.Configuration
2525
{
2626
public class ConnectionSettingsTests
2727
{
28-
private static readonly ConnectionSettings __defaults = new ConnectionSettings();
28+
private static readonly ConnectionSettings __defaults = new();
2929

3030
[Fact]
3131
public void constructor_should_initialize_instance()
@@ -35,6 +35,7 @@ public void constructor_should_initialize_instance()
3535
subject.ApplicationName.Should().BeNull();
3636
subject.AuthenticatorFactory.Should().BeNull();
3737
subject.Compressors.Should().BeEmpty();
38+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
3839
subject.LibraryInfo.Should().BeNull();
3940
subject.MaxIdleTime.Should().Be(TimeSpan.FromMinutes(10));
4041
subject.MaxLifeTime.Should().Be(TimeSpan.FromMinutes(30));
@@ -90,6 +91,7 @@ public void constructor_with_applicationName_should_initialize_instance()
9091
subject.ApplicationName.Should().Be("app");
9192
subject.AuthenticatorFactory.Should().Be(__defaults.AuthenticatorFactory);
9293
subject.Compressors.Should().Equal(__defaults.Compressors);
94+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
9395
subject.LibraryInfo.Should().BeNull();
9496
subject.MaxIdleTime.Should().Be(__defaults.MaxIdleTime);
9597
subject.MaxLifeTime.Should().Be(__defaults.MaxLifeTime);
@@ -105,6 +107,7 @@ public void constructor_with_authenticatorFactory_should_initialize_instance()
105107
subject.ApplicationName.Should().BeNull();
106108
subject.AuthenticatorFactory.Should().Be(authenticatorFactory);
107109
subject.Compressors.Should().BeEquivalentTo(__defaults.Compressors);
110+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
108111
subject.LibraryInfo.Should().BeNull();
109112
subject.MaxIdleTime.Should().Be(__defaults.MaxIdleTime);
110113
subject.MaxLifeTime.Should().Be(__defaults.MaxLifeTime);
@@ -120,6 +123,7 @@ public void constructor_with_compressors_should_initialize_instance()
120123
subject.ApplicationName.Should().BeNull();
121124
subject.AuthenticatorFactory.Should().BeNull();
122125
subject.Compressors.Should().Equal(compressors);
126+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
123127
subject.LibraryInfo.Should().BeNull();
124128
subject.MaxIdleTime.Should().Be(__defaults.MaxIdleTime);
125129
subject.MaxLifeTime.Should().Be(__defaults.MaxLifeTime);
@@ -133,6 +137,7 @@ public void constructor_with_library_info_should_initialize_instance()
133137
subject.ApplicationName.Should().BeNull();
134138
subject.AuthenticatorFactory.Should().Be(__defaults.AuthenticatorFactory);
135139
subject.Compressors.Should().Equal(__defaults.Compressors);
140+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
136141
subject.LibraryInfo.Should().Be(new LibraryInfo("lib", "1.0"));
137142
subject.MaxIdleTime.Should().Be(__defaults.MaxIdleTime);
138143
subject.MaxLifeTime.Should().Be(__defaults.MaxLifeTime);
@@ -148,6 +153,7 @@ public void constructor_with_maxIdleTime_should_initialize_instance()
148153
subject.ApplicationName.Should().BeNull();
149154
subject.AuthenticatorFactory.Should().BeNull();
150155
subject.Compressors.Should().Equal(__defaults.Compressors);
156+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
151157
subject.LibraryInfo.Should().BeNull();
152158
subject.MaxIdleTime.Should().Be(maxIdleTime);
153159
subject.MaxLifeTime.Should().Be(__defaults.MaxLifeTime);
@@ -163,6 +169,7 @@ public void constructor_with_maxLifeTime_should_initialize_instance()
163169
subject.ApplicationName.Should().BeNull();
164170
subject.AuthenticatorFactory.Should().BeNull();
165171
subject.Compressors.Should().Equal(__defaults.Compressors);
172+
subject.ConnectionIdLocalValueProvider.Should().NotBeNull();
166173
subject.LibraryInfo.Should().BeNull();
167174
subject.MaxIdleTime.Should().Be(__defaults.MaxIdleTime);
168175
subject.MaxLifeTime.Should().Be(maxLifeTime);
@@ -180,6 +187,7 @@ public void With_applicationName_should_return_expected_result()
180187
result.ApplicationName.Should().Be(newApplicationName);
181188
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
182189
result.Compressors.Should().Equal(__defaults.Compressors);
190+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
183191
result.LibraryInfo.Should().BeNull();
184192
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
185193
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
@@ -193,11 +201,12 @@ public void With_authenticatorFactories_should_return_expected_result()
193201

194202
var subject = new ConnectionSettings(authenticatorFactory: oldAuthenticatorFactory);
195203

196-
var result = subject.With(authenticatorFactory: Optional.Create(newAuthenticatorFactory));
204+
var result = subject.WithInternal(authenticatorFactory: Optional.Create(newAuthenticatorFactory));
197205

198206
result.ApplicationName.Should().Be(subject.ApplicationName);
199207
result.AuthenticatorFactory.Should().Be(newAuthenticatorFactory);
200208
result.Compressors.Should().Equal(subject.Compressors);
209+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
201210
result.LibraryInfo.Should().BeNull();
202211
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
203212
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
@@ -215,6 +224,24 @@ public void With_compressors_should_return_expected_result()
215224
result.ApplicationName.Should().Be(subject.ApplicationName);
216225
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
217226
result.Compressors.Should().Equal(newCompressors);
227+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
228+
result.LibraryInfo.Should().BeNull();
229+
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
230+
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
231+
}
232+
233+
[Fact]
234+
public void With_ConnectionIdLocalValueProvider_should_return_expected_result()
235+
{
236+
Func<long> connectIdLocalValueProvider = () => 1;
237+
var subject = new ConnectionSettings();
238+
239+
var result = subject.WithInternal(connectionIdLocalValueProvider: connectIdLocalValueProvider);
240+
241+
result.ApplicationName.Should().Be(subject.ApplicationName);
242+
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
243+
result.Compressors.Should().Equal(subject.Compressors);
244+
result.ConnectionIdLocalValueProvider.Should().Be(connectIdLocalValueProvider);
218245
result.LibraryInfo.Should().BeNull();
219246
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
220247
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
@@ -232,6 +259,7 @@ public void With_libraryInfo_should_return_expected_result()
232259
result.ApplicationName.Should().Be(subject.ApplicationName);
233260
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
234261
result.Compressors.Should().Equal(__defaults.Compressors);
262+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
235263
result.LibraryInfo.Should().Be(newlibraryInfo);
236264
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
237265
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
@@ -249,6 +277,7 @@ public void With_maxIdleTime_should_return_expected_result()
249277
result.ApplicationName.Should().Be(subject.ApplicationName);
250278
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
251279
result.Compressors.Should().Equal(subject.Compressors);
280+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
252281
result.LibraryInfo.Should().BeNull();
253282
result.MaxIdleTime.Should().Be(newMaxIdleTime);
254283
result.MaxLifeTime.Should().Be(subject.MaxLifeTime);
@@ -266,6 +295,7 @@ public void With_maxLifeTime_should_return_expected_result()
266295
result.ApplicationName.Should().Be(subject.ApplicationName);
267296
result.AuthenticatorFactory.Should().Be(subject.AuthenticatorFactory);
268297
result.Compressors.Should().Equal(subject.Compressors);
298+
result.ConnectionIdLocalValueProvider.Should().Be(subject.ConnectionIdLocalValueProvider);
269299
result.LibraryInfo.Should().BeNull();
270300
result.MaxIdleTime.Should().Be(subject.MaxIdleTime);
271301
result.MaxLifeTime.Should().Be(newMaxLifeTime);

‎tests/MongoDB.Driver.Tests/Core/ConnectionPools/MaintenanceHelperTests.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void Start_should_not_create_thread_if_already_running()
137137

138138
[Theory]
139139
[ParameterAttributeData]
140-
public void Stop_should_trigger_immidiate_maintenace_call(
140+
public void Stop_should_trigger_immediate_maintenance_call(
141141
[Values(false, true)] bool checkOutConnection,
142142
[Values(false, true)] bool closeInUseConnection)
143143
{

0 commit comments

Comments
 (0)