Close clients in ClusterTools when all clients are closed and reconnect them automatically if perished (#1469)

Author: p-mongo

spec/support/client_registry.rb

@@ -50,22 +50,33 @@ def initialize
     @lock = Mutex.new
   end
 
-  def global_client(name)
-    if client = @global_clients[name]
+  class << self
+    def client_perished?(client)
       if !client.cluster.connected?
-        reconnect = true
+        true
       else
-        reconnect = false
+        perished = false
         client.cluster.servers_list.each do |server|
           thread = server.monitor.instance_variable_get('@thread')
           if thread.nil? || !thread.alive?
-            reconnect = true
+            perished = true
           end
         end
+        perished
       end
-      if reconnect
+    end
+    private :client_perished?
+
+    def reconnect_client_if_perished(client)
+      if client_perished?(client)
         client.reconnect
       end
+    end
+  end
+
+  def global_client(name)
+    if client = @global_clients[name]
+      self.class.reconnect_client_if_perished(client)
       return client
     end
 
@@ -204,6 +215,7 @@ def close_local_clients
   end
 
   def close_all_clients
+    ClusterTools.instance.close_clients
     close_local_clients
     @lock.synchronize do
       @global_clients.each do |name, client|

spec/support/cluster_tools.rb

@@ -313,18 +313,39 @@ def admin_client
     # Since we are triggering elections, we need to have a higher server
     # selection timeout applied. The default timeout for tests assumes a
     # stable deployment.
-    @admin_client ||= ClientRegistry.instance.global_client('root_authorized').
-      with(server_selection_timeout: 15).use(:admin)
+    (
+      @admin_client ||= ClientRegistry.instance.global_client('root_authorized').
+        with(server_selection_timeout: 15).use(:admin)
+    ).tap do |client|
+      ClientRegistry.reconnect_client_if_perished(client)
+    end
   end
 
   def direct_client(address, options = {})
     @direct_clients ||= {}
     cache_key = {address: address}.update(options)
-    @direct_clients[cache_key] ||= ClientRegistry.instance.new_local_client(
-      [address.to_s],
-      SpecConfig.instance.test_options.merge(
-        SpecConfig.instance.auth_options).merge(
-        connect: :direct, server_selection_timeout: 10).merge(options))
+    (
+      @direct_clients[cache_key] ||= ClientRegistry.instance.new_local_client(
+        [address.to_s],
+        SpecConfig.instance.test_options.merge(
+          SpecConfig.instance.auth_options).merge(
+          connect: :direct, server_selection_timeout: 10).merge(options))
+    ).tap do |client|
+      ClientRegistry.reconnect_client_if_perished(client)
+    end
+  end
+
+  def close_clients
+    if @admin_client
+      @admin_client.close
+      @admin_client = nil
+    end
+    if @direct_clients
+      @direct_clients.each do |cache_key, client|
+        client.close
+      end
+      @direct_clients = nil
+    end
   end
 
   private