RUBY-1885 Remove wait argument on client/cluster/etc. close/disconnect methods (#1526)

* RUBY-1885 Remove wait argument on client/cluster/etc. close/disconnect methods

* Fix the test suite

* wait=true behavior is gone

Author: p-mongo

lib/mongo/client.rb

@@ -669,17 +669,11 @@ def write_concern
 
     # Close all connections.
     #
-    # @example Disconnect the client.
-    #   client.close
-    #
-    # @param [ Boolean ] wait Whether to wait for background threads to
-    #   finish running.
-    #
     # @return [ true ] Always true.
     #
     # @since 2.1.0
-    def close(wait=false)
-      @cluster.disconnect!(wait)
+    def close
+      @cluster.disconnect!
       true
     end
 

lib/mongo/cluster.rb

@@ -422,22 +422,20 @@ def self.finalize(pools, periodic_executor, session_pool)
       end
     end
 
-    # Close the cluster and disconnect all servers.
+    # Closes the cluster.
     #
     # @note Applications should call Client#close to disconnect from
     # the cluster rather than calling this method. This method is for
     # internal driver use only.
     #
-    # @example Disconnect the cluster's servers.
-    #   cluster.disconnect!
-    #
-    # @param [ Boolean ] wait Whether to wait for background threads to
-    #   finish running.
+    # Disconnects all servers in the cluster, publishing appropriate SDAM
+    # events in the process. Stops SRV monitoring if it is active.
+    # Marks the cluster disconnected.
     #
     # @return [ true ] Always true.
     #
     # @since 2.1.0
-    def disconnect!(wait=false)
+    def disconnect!
       unless @connecting || @connected
         return true
       end
@@ -452,7 +450,7 @@ def disconnect!(wait=false)
       end
       @servers.each do |server|
         if server.connected?
-          server.disconnect!(wait)
+          server.disconnect!
           publish_sdam_event(
             Monitoring::SERVER_CLOSED,
             Monitoring::Event::ServerClosed.new(server.address, topology)

lib/mongo/server.rb

@@ -219,41 +219,35 @@ def context
     # @deprecated No longer necessary with Server Selection specification.
     def connectable?; end
 
-    # Disconnect the server from the connection.
+    # Disconnect the driver from this server.
     #
-    # @example Disconnect the server.
-    #   server.disconnect!
+    # Disconnects all idle connections to this server in its connection pool,
+    # if any exist. Stops the populator of the connection pool, if it is
+    # running. Does not immediately close connections which are presently
+    # checked out (i.e. in use) - such connections will be closed when they
+    # are returned to their respective connection pools. Stop the server's
+    # background monitor.
     #
-    # @param [ Boolean ] wait Whether to wait for background threads to
-    #   finish running.
-    #
-    # @return [ true ] Always true with no exception.
+    # @return [ true ] Always true.
     #
     # @since 2.0.0
-    def disconnect!(wait=false)
+    def disconnect!
       if monitor
         monitor.stop!
       end
       _pool = @pool_lock.synchronize do
         @pool
       end
       if _pool
-        if wait
-          _pool.close(wait: wait)
-          # Need to clear @pool as otherwise the old pool will continue to be
-          # used if this server is reconnected in the future.
-          @pool = nil
-        else
-          # For backwards compatibility we disconnect/clear the pool rather
-          # than close it here. We also stop the populator which allows the
-          # the pool to continue providing connections but stops it from
-          # connecting in background on clients/servers that are in fact
-          # intended to be closed and no longer used.
-          begin
-            _pool.disconnect!(stop_populator: true)
-          rescue Error::PoolClosedError
-            # If the pool was already closed, we don't need to do anything here.
-          end
+        # For backwards compatibility we disconnect/clear the pool rather
+        # than close it here. We also stop the populator which allows the
+        # the pool to continue providing connections but stops it from
+        # connecting in background on clients/servers that are in fact
+        # intended to be closed and no longer used.
+        begin
+          _pool.disconnect!(stop_populator: true)
+        rescue Error::PoolClosedError
+          # If the pool was already closed, we don't need to do anything here.
         end
       end
       @connected = false

lib/mongo/server/connection_pool.rb

@@ -485,10 +485,8 @@ def clear(options = nil)
       #
       # @option options [ true | false ] :force Also close all checked out
       #   connections.
-      # @option options [ true | false ] :wait Wait for background threads to
-      #   exit before returning. Added in 2.10.0.
       #
-      # @return [ true ] true.
+      # @return [ true ] Always true.
       #
       # @since 2.9.0
       def close(options = nil)

spec/integration/change_stream_examples_spec.rb

@@ -22,10 +22,6 @@
     inventory.drop
   end
 
-  after do
-    client.close(true)
-  end
-
   context 'example 1 - basic watching'do
 
     it 'returns a change after an insertion' do

spec/integration/connection_pool_populator_spec.rb

@@ -281,7 +281,7 @@
 
         fork do
           # follow forking guidance
-          client.close(true)
+          client.close
           client.reconnect
           # let pool populate
           sleep 2

spec/integration/retryable_writes_errors_spec.rb

@@ -18,10 +18,6 @@
       authorized_client.with(retry_writes: true)
     end
 
-    after do
-      client.close(true)
-    end
-
     context 'when a retryable write is attempted' do
       it 'raises an actionable error message' do
         expect {

spec/integration/sdam_events_spec.rb

@@ -13,7 +13,7 @@
       client.database.command(ismaster: 1)
       expect(subscriber.events).to be_empty
 
-      client.close(true)
+      client.close
 
       expect(subscriber.events).not_to be_empty
       event = subscriber.first_event('server_closed_event')
@@ -31,7 +31,7 @@
       client.database.command(ismaster: 1)
       expect(subscriber.events).to be_empty
 
-      client.close(true)
+      client.close
 
       expect(subscriber.events).not_to be_empty
       event = subscriber.first_event('topology_closed_event')

spec/integration/server_selector_spec.rb

@@ -39,7 +39,7 @@
       context 'there is a known primary' do
         before do
           client.cluster.next_primary
-          client.close(true)
+          client.close
           expect(client.cluster.connected?).to be false
         end
 
@@ -51,7 +51,7 @@
       context 'there is no known primary' do
         before do
           primary_server = client.cluster.next_primary
-          client.close(true)
+          client.close
           expect(client.cluster.connected?).to be false
           primary_server.unknown!
         end

spec/mongo/auth/scram/negotiation_spec.rb

@@ -27,7 +27,7 @@
         roles: ['root'],
         mechanisms: server_user_auth_mechanisms,
       )
-      client.close(true)
+      client.close
     end
   end