Skip to content

Commit 5a17b36

Browse files
committed
CSHARP-6029: Make ICoreServerSessionPool disposable and send endSessions on dispose - fix failing tests
1 parent 4578964 commit 5a17b36

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/MongoDB.Driver/Core/Bindings/CoreServerSessionPool.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,11 @@ public void CloseAndDispose(IServer server)
114114
while (true)
115115
{
116116
var batchSize = Math.Min(10000, _pool.Count);
117+
if (batchSize == 0)
118+
{
119+
return;
120+
}
121+
117122
var batch = new ICoreServerSession[batchSize];
118123

119124
batchSize = _pool.TryPopRange(batch);

tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/OpenTelemetryTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ public void MongoClient_should_create_activities_when_tracing_enabled()
4848
ClusterRegistry.Instance.UnregisterAndDisposeCluster(mongoClient.Cluster);
4949
}
5050

51-
capturedActivities.Should().HaveCount(6);
51+
capturedActivities.Should().HaveCount(7);
5252

5353
var operationActivities = capturedActivities.Where(a => a.GetTagItem("db.operation.name") != null).ToList();
5454
var commandActivities = capturedActivities.Where(a => a.GetTagItem("db.command.name") != null).ToList();
5555

5656
operationActivities.Should().HaveCount(3);
57-
commandActivities.Should().HaveCount(3);
57+
commandActivities.Should().HaveCount(4);
5858
}
5959

6060
[Fact]

0 commit comments

Comments
 (0)