CSHARP-1492: Added UnregisterAndDisposeCluster to ClusterRegistry.

Author: rstam

src/MongoDB.Driver.Core/Properties/AssemblyInfo.cs

@@ -34,4 +34,6 @@
 [assembly: InternalsVisibleTo("MongoDB.Driver.Core.TestHelpers")]
 [assembly: InternalsVisibleTo("MongoDB.Driver.Core.Tests")]
 [assembly: InternalsVisibleTo("MongoDB.Driver.Core.Tests.Dotnet")]
+[assembly: InternalsVisibleTo("MongoDB.Driver.Tests")]
+[assembly: InternalsVisibleTo("MongoDB.Driver.Tests.Dotnet")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]

src/MongoDB.Driver/ClusterRegistry.cs

@@ -35,13 +35,19 @@ namespace MongoDB.Driver
     /// <summary>
     /// Represents a registry of already created clusters.
     /// </summary>
-    internal class ClusterRegistry
+    public class ClusterRegistry
     {
         #region static
         // static fields
         private static readonly ClusterRegistry __instance = new ClusterRegistry();
 
         // static properties
+        /// <summary>
+        /// Gets the default cluster registry.
+        /// </summary>
+        /// <value>
+        /// The default cluster registry.
+        /// </value>
         public static ClusterRegistry Instance
         {
             get { return __instance; }
@@ -155,7 +161,7 @@ private TcpStreamSettings ConfigureTcp(TcpStreamSettings settings, ClusterKey cl
                 writeTimeout: clusterKey.SocketTimeout);
         }
 
-        public ICluster GetOrCreateCluster(ClusterKey clusterKey)
+        internal ICluster GetOrCreateCluster(ClusterKey clusterKey)
         {
             lock (_lock)
             {
@@ -178,5 +184,34 @@ SslPolicyErrors sslPolicyErrors
         {
             return true;
         }
+
+        /// <summary>
+        /// Unregisters and disposes the cluster.
+        /// </summary>
+        /// <param name="cluster">The cluster.</param>
+        public void UnregisterAndDisposeCluster(ICluster cluster)
+        {
+            Ensure.IsNotNull(cluster, nameof(cluster));
+
+            lock (_lock)
+            {
+                ClusterKey clusterKey = null;
+                foreach (var keyValuePair in _registry)
+                {
+                    if (object.ReferenceEquals(keyValuePair.Value, cluster))
+                    {
+                        clusterKey = keyValuePair.Key;
+                        break;
+                    }
+                }
+
+                if (clusterKey != null)
+                {
+                    _registry.Remove(clusterKey);
+                }
+            }
+
+            cluster.Dispose();
+        }
     }
 }

tests/MongoDB.Driver.Tests/ClusterRegistryTests.cs

@@ -14,15 +14,18 @@
 */
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Reflection;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Driver;
 using MongoDB.Driver.Core.Clusters;
 using MongoDB.Driver.Core.Clusters.ServerSelectors;
+using MongoDB.Driver.Core.Misc;
 using Xunit;
 
 namespace MongoDB.Driver.Tests
@@ -127,5 +130,35 @@ public void GetOrCreateCluster_should_return_the_same_cluster_if_client_settings
                 cluster2.Should().BeSameAs(cluster1);
             }
         }
+
+        [Fact]
+        public void UnregisterAndDisposeCluster_should_unregister_and_dispose_the_cluster()
+        {
+            var subject = new ClusterRegistry();
+            var settings = new MongoClientSettings();
+            var clusterKey = settings.ToClusterKey();
+            var cluster = subject.GetOrCreateCluster(clusterKey);
+
+            subject.UnregisterAndDisposeCluster(cluster);
+
+            subject._registry().Count.Should().Be(0);
+            cluster._state().Should().Be(2);
+        }
+    }
+
+    internal static class ClusterRegistryTestsReflector
+    {
+        public static Dictionary<ClusterKey, ICluster> _registry(this ClusterRegistry clusterRegistry)
+        {
+            var fieldInfo = typeof(ClusterRegistry).GetField("_registry", BindingFlags.NonPublic | BindingFlags.Instance);
+            return (Dictionary<ClusterKey, ICluster>)fieldInfo.GetValue(clusterRegistry);
+        }
+
+        public static int _state(this ICluster cluster)
+        {
+            var fieldInfo = typeof(SingleServerCluster).GetField("_state", BindingFlags.NonPublic | BindingFlags.Instance);
+            var interlockedInt32 = (InterlockedInt32)fieldInfo.GetValue(cluster);
+            return interlockedInt32.Value;
+        }
     }
 }