Perform query to make sure cluster details are loaded (#607)

DavidBoike · web-flow · commit 04be6e3ef8a0 · 2024-03-18T14:04:35.000-05:00
diff --git a/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.AcceptanceTests/NServiceBus.Storage.MongoDB.AcceptanceTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests/NServiceBus.Storage.MongoDB.NoTx.AcceptanceTests.csproj
@@ -17,7 +17,7 @@
     <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="7.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj b/src/NServiceBus.Storage.MongoDB.Tests/NServiceBus.Storage.MongoDB.Tests.csproj
@@ -12,7 +12,7 @@
   <ItemGroup>
     <PackageReference Include="GitHubActionsTestLogger" Version="2.3.3" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
     <PackageReference Include="NServiceBus" Version="7.8.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
diff --git a/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj b/src/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests/NServiceBus.Storage.MongoDB.TransactionalSession.AcceptanceTests.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="NServiceBus.TransactionalSession" Version="1.0.0" />
     <PackageReference Include="NUnit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.24.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NServiceBus.Storage.MongoDB/SynchronizedStorage/SynchronizedStorage.cs b/src/NServiceBus.Storage.MongoDB/SynchronizedStorage/SynchronizedStorage.cs
@@ -23,15 +23,11 @@ protected override void Setup(FeatureConfigurationContext context)
 
             try
             {
-                client.GetDatabase(databaseName);
-            }
-            catch (ArgumentException ex)
-            {
-                throw new Exception($"The persistence database name '{databaseName}' is invalid. Configure a valid database name by calling 'EndpointConfiguration.UsePersistence<{nameof(MongoPersistence)}>().DatabaseName(databaseName)'.", ex);
-            }
+                var database = client.GetDatabase(databaseName);
+
+                // perform a query to the server to make sure cluster details are loaded
+                database.ListCollectionNames();
 
-            try
-            {
                 using (var session = client.StartSession())
                 {
                     if (useTransactions)
@@ -58,6 +54,10 @@ protected override void Setup(FeatureConfigurationContext context)
                     }
                 }
             }
+            catch (ArgumentException ex)
+            {
+                throw new Exception($"The persistence database name '{databaseName}' is invalid. Configure a valid database name by calling 'EndpointConfiguration.UsePersistence<{nameof(MongoPersistence)}>().DatabaseName(databaseName)'.", ex);
+            }
             catch (NotSupportedException ex)
             {
                 throw new Exception("Sessions are not supported by the MongoDB server. The NServiceBus.Storage.MongoDB persistence requires MongoDB server version 3.6 or greater.", ex);

Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,11 @@ protected override void Setup(FeatureConfigurationContext context)`
`23`	`23`
`24`	`24`	`try`
`25`	`25`	`{`
`26`		`- client.GetDatabase(databaseName);`
`27`		`- }`
`28`		`- catch (ArgumentException ex)`
`29`		`- {`
`30`		`- throw new Exception($"The persistence database name '{databaseName}' is invalid. Configure a valid database name by calling 'EndpointConfiguration.UsePersistence<{nameof(MongoPersistence)}>().DatabaseName(databaseName)'.", ex);`
`31`		`- }`
	`26`	`+ var database = client.GetDatabase(databaseName);`
	`27`	`+`
	`28`	`+ // perform a query to the server to make sure cluster details are loaded`
	`29`	`+ database.ListCollectionNames();`
`32`	`30`
`33`		`- try`
`34`		`- {`
`35`	`31`	`using (var session = client.StartSession())`
`36`	`32`	`{`
`37`	`33`	`if (useTransactions)`
`@@ -58,6 +54,10 @@ protected override void Setup(FeatureConfigurationContext context)`
`58`	`54`	`}`
`59`	`55`	`}`
`60`	`56`	`}`
	`57`	`+ catch (ArgumentException ex)`
	`58`	`+ {`
	`59`	`+ throw new Exception($"The persistence database name '{databaseName}' is invalid. Configure a valid database name by calling 'EndpointConfiguration.UsePersistence<{nameof(MongoPersistence)}>().DatabaseName(databaseName)'.", ex);`
	`60`	`+ }`
`61`	`61`	`catch (NotSupportedException ex)`
`62`	`62`	`{`
`63`	`63`	`throw new Exception("Sessions are not supported by the MongoDB server. The NServiceBus.Storage.MongoDB persistence requires MongoDB server version 3.6 or greater.", ex);`