mongo 2.7.2 → 2.8.0.rc0

data/lib/mongo/server/connection_pool/queue.rb

@@ -92,7 +92,10 @@ module Mongo
         # @return [ Array ] queue The underlying array of connections.
         attr_reader :queue
 
-        # @return [ Mutex ] mutex The mutex used for synchronization.
+        # @return [ Mutex ] mutex The mutex used for synchronization of
+        #   access to #queue.
+        #
+        # @api private
         attr_reader :mutex
 
         # @return [ Hash ] options The options.
@@ -104,7 +107,11 @@ module Mongo
         # Number of connections that the pool has which are ready to be
         # checked out. This is NOT the size of the connection pool (total
         # number of active connections created by the pool).
-        def_delegators :queue, :size
+        def size
+          mutex.synchronize do
+            queue.size
+          end
+        end
 
         # Number of connections that the pool has which are ready to be
         # checked out.
@@ -133,14 +140,15 @@ module Mongo
         # @since 2.0.0
         def dequeue
           check_count_invariants
-          mutex.synchronize do
-            dequeue_connection
-          end
+          dequeue_connection
         ensure
           check_count_invariants
         end
 
-        # Disconnect all connections in the queue.
+        # Closes all idle connections in the queue and schedules currently
+        # dequeued connections to be closed when they are enqueued back into
+        # the queue. The queue remains operational and can create new
+        # connections when requested.
         #
         # @example Disconnect all connections.
         #   queue.disconnect!
@@ -151,19 +159,16 @@ module Mongo
         def disconnect!
           check_count_invariants
           mutex.synchronize do
-            queue.each{ |connection| connection.disconnect! }
-            @pool_size -= queue.length
-            if @pool_size < 0
-              # This should never happen
-              log_warn("ConnectionPool::Queue: connection accounting problem")
-              @pool_size = 0
+            while connection = queue.pop
+              connection.disconnect!
+              @pool_size -= 1
+              if @pool_size < 0
+                # This should never happen
+                log_warn("ConnectionPool::Queue: connection accounting problem")
+                @pool_size = 0
+              end
             end
-            queue.clear
             @generation += 1
-            while @pool_size < min_size
-              @pool_size += 1
-              queue.unshift(@block.call(@generation))
-            end
             true
           end
         ensure
@@ -290,26 +295,19 @@ module Mongo
           check_count_invariants
           return unless max_idle_time
 
-          to_refresh = []
-          queue.each do |connection|
-            if last_checkin = connection.last_checkin
-              if (Time.now - last_checkin) > max_idle_time
-                to_refresh << connection
-              end
-            end
-          end
-
           mutex.synchronize do
-            num_checked_out = pool_size - queue_size
-            min_size_delta = [(min_size - num_checked_out), 0].max
-
-            to_refresh.each do |connection|
-              if queue.include?(connection)
-                connection.disconnect!
-                if queue.index(connection) < min_size_delta
-                  begin; connection.connect!; rescue; end
+            i = 0
+            while i < queue.length
+              connection = queue[i]
+              if last_checkin = connection.last_checkin
+                if (Time.now - last_checkin) > max_idle_time
+                  connection.disconnect!
+                  queue.delete_at(i)
+                  @pool_size -= 1
+                  next
                 end
               end
+              i += 1
             end
           end
         ensure
@@ -319,12 +317,14 @@ module Mongo
         private
 
         def dequeue_connection
-          deadline = Time.now + wait_timeout
-          loop do
-            return queue.shift unless queue.empty?
-            connection = create_connection
-            return connection if connection
-            wait_for_next!(deadline)
+          mutex.synchronize do
+            deadline = Time.now + wait_timeout
+            loop do
+              return queue.shift unless queue.empty?
+              connection = create_connection
+              return connection if connection
+              wait_for_next!(deadline)
+            end
           end
         end
 
@@ -345,7 +345,7 @@ module Mongo
 
         def check_count_invariants
           if Mongo::Lint.enabled?
-            if pool_size < min_size
+            if pool_size < 0
               raise Error::LintError, 'connection pool queue: underflow'
             end
             if pool_size > max_size

data/lib/mongo/server/description.rb

@@ -196,7 +196,7 @@ module Mongo
           @features = Features.new(wire_versions, me || @address.to_s)
         end
         @average_round_trip_time = average_round_trip_time
-        @last_update_time = Time.now.dup.freeze
+        @last_update_time = Time.now.freeze
 
         if Mongo::Lint.enabled?
           # prepopulate cache instance variables

data/lib/mongo/server/monitor.rb

@@ -227,7 +227,7 @@ module Mongo
           if monitoring.monitoring?
             monitoring.started(
               Monitoring::SERVER_HEARTBEAT,
-              Monitoring::Event::ServerHeartbeatStarted.new(connection.address)
+              Monitoring::Event::ServerHeartbeatStarted.new(description.address)
             )
           end
 
@@ -235,11 +235,11 @@ module Mongo
             connection.ismaster
           end
           if exc
-            log_debug("Error running ismaster on #{connection.address}: #{exc.message}")
+            log_debug("Error running ismaster on #{description.address}: #{exc.message}")
             if monitoring.monitoring?
               monitoring.failed(
                 Monitoring::SERVER_HEARTBEAT,
-                Monitoring::Event::ServerHeartbeatFailed.new(connection.address, rtt, exc)
+                Monitoring::Event::ServerHeartbeatFailed.new(description.address, rtt, exc)
               )
             end
             result = {}
@@ -247,7 +247,7 @@ module Mongo
             if monitoring.monitoring?
               monitoring.succeeded(
                 Monitoring::SERVER_HEARTBEAT,
-                Monitoring::Event::ServerHeartbeatSucceeded.new(connection.address, rtt)
+                Monitoring::Event::ServerHeartbeatSucceeded.new(description.address, rtt)
               )
             end
           end

data/lib/mongo/server/monitor/connection.rb

@@ -73,7 +73,14 @@ module Mongo
         COMPRESSION_WARNING = 'The server has no compression algorithms in common with those requested. ' +
                                 'Compression will not be used.'.freeze
 
-        # Initialize a new socket connection from the client to the server.
+        # Creates a new connection object to the specified target address
+        # with the specified options.
+        #
+        # The constructor does not perform any I/O (and thus does not create
+        # sockets nor handshakes); call connect! method on the connection
+        # object to create the network connection.
+        #
+        # @note Monitoring connections do not authenticate.
         #
         # @api private
         #
@@ -113,6 +120,12 @@ module Mongo
           @compressor = nil
         end
 
+        # @return [ Hash ] options The passed in options.
+        attr_reader :options
+
+        # @return [ Mongo::Address ] address The address to connect to.
+        attr_reader :address
+
         # The compressor, which is determined during the handshake.
         #
         # @since 2.5.0
@@ -135,7 +148,9 @@ module Mongo
           end
         end
 
-        # Tell the underlying socket to establish a connection to the host.
+        # Establishes a network connection to the target address.
+        #
+        # If the connection is already established, this method does nothing.
         #
         # @example Connect to the host.
         #   connection.connect!
@@ -147,10 +162,11 @@ module Mongo
         #
         # @since 2.0.0
         def connect!
-          unless socket && socket.connectable?
-            @socket = address.socket(socket_timeout, ssl_options)
-            address.connect_socket!(socket)
-            handshake!
+          unless @socket
+            socket = address.socket(socket_timeout, ssl_options,
+              connect_timeout: address.connect_timeout)
+            handshake!(socket)
+            @socket = socket
           end
           true
         end
@@ -204,13 +220,16 @@ module Mongo
           end
         end
 
-        def handshake!
+        def handshake!(socket)
           if @app_metadata
             socket.write(@app_metadata.ismaster_bytes)
             reply = Protocol::Message.deserialize(socket, Mongo::Protocol::Message::MAX_MESSAGE_SIZE).documents[0]
             set_compressor!(reply)
             reply
           end
+        rescue => e
+          log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
+          raise
         end
 
         def retry_message

data/lib/mongo/server/pending_connection.rb

@@ -0,0 +1,36 @@
+# Copyright (C) 2019 MongoDB, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Mongo
+  class Server
+
+    # This class encapsulates connections during handshake and authentication.
+    #
+    # @api private
+    class PendingConnection < ConnectionBase
+      extend Forwardable
+
+      def initialize(socket, server, monitoring, options = {})
+        @socket = socket
+        @options = options
+        @server = server
+        @monitoring = monitoring
+      end
+
+      def ensure_connected
+        yield @socket
+      end
+    end
+  end
+end

data/lib/mongo/server_selector/selectable.rb

@@ -124,7 +124,7 @@ module Mongo
         @local_threshold = cluster.options[:local_threshold] || LOCAL_THRESHOLD
         @server_selection_timeout = cluster.options[:server_selection_timeout] || SERVER_SELECTION_TIMEOUT
         deadline = Time.now + server_selection_timeout
-        while (deadline - Time.now) > 0
+        while (time_remaining = deadline - Time.now) > 0
           servers = candidates(cluster)
           if Lint.enabled?
             servers.each do |server|
@@ -155,6 +155,14 @@ module Mongo
             return server
           end
           cluster.scan!(false)
+          if cluster.server_selection_semaphore
+            cluster.server_selection_semaphore.wait(time_remaining)
+          else
+            if Lint.enabled?
+              raise Error::LintError, 'Waiting for server selection without having a server selection semaphore'
+            end
+            sleep 0.25
+          end
         end
 
         msg = "No #{name} server is available in cluster: #{cluster.summary} " +

data/lib/mongo/session.rb

@@ -812,7 +812,6 @@ module Mongo
             if e.label?(Mongo::Error::UNKNOWN_TRANSACTION_COMMIT_RESULT_LABEL)
               # WriteConcernFailed
               if e.is_a?(Mongo::Error::OperationFailure) && e.code == 64 && e.wtimeout?
-                transaction_in_progress = false
                 raise
               end
               if Time.now >= deadline

data/lib/mongo/socket.rb

@@ -34,6 +34,7 @@ module Mongo
     # Error message for timeouts on socket calls.
     #
     # @since 2.0.0
+    # @deprecated
     TIMEOUT_ERROR = 'Socket request timed out'.freeze
 
     # The pack directive for timeouts.
@@ -47,6 +48,9 @@ module Mongo
     # @return [ Socket ] socket The wrapped socket.
     attr_reader :socket
 
+    # @return [ Hash ] The options.
+    attr_reader :options
+
     # Is the socket connection alive?
     #
     # @example Is the socket alive?
@@ -162,7 +166,16 @@ module Mongo
     # @since 2.0.5
     def eof?
       @socket.eof?
-    rescue IOError, SystemCallError => _
+    rescue IOError, SystemCallError
+      true
+    end
+
+    # For backwards compatibilty only, do not use.
+    #
+    # @return [ true ] Always true.
+    #
+    # @deprecated
+    def connectable?
       true
     end
 
@@ -189,7 +202,7 @@ module Mongo
         buf_size = length
       end
 
-      # The binary encoding is important, otherwise ruby performs encoding
+      # The binary encoding is important, otherwise Ruby performs encoding
       # conversions of some sort during the write into the buffer which
       # kills performance
       buf = allocate_string(buf_size)
@@ -281,13 +294,17 @@ module Mongo
     def handle_errors
       begin
         yield
-      rescue Errno::ETIMEDOUT
-        raise Error::SocketTimeoutError, TIMEOUT_ERROR
+      rescue Errno::ETIMEDOUT => e
+        raise Error::SocketTimeoutError, "#{e.class}: #{e} (for #{address})"
       rescue IOError, SystemCallError => e
-        raise Error::SocketError, "#{e.class}: #{e}"
+        raise Error::SocketError, "#{e.class}: #{e} (for #{address})"
       rescue OpenSSL::SSL::SSLError => e
-        raise Error::SocketError, "#{e.class}: #{e} (#{SSL_ERROR})"
+        raise Error::SocketError, "#{e.class}: #{e} (for #{address}) (#{SSL_ERROR})"
       end
     end
+
+    def address
+      raise NotImplementedError
+    end
   end
 end

data/lib/mongo/socket/ssl.rb

@@ -32,9 +32,6 @@ module Mongo
       # @return [ String ] host_name The original host name.
       attr_reader :host_name
 
-      # @return [ Hash ] The ssl options.
-      attr_reader :options
-
       # @return [ Integer ] port The port to connect to.
       attr_reader :port
 
@@ -52,8 +49,8 @@ module Mongo
       # @return [ SSL ] The connected socket instance.
       #
       # @since 2.0.0
-      def connect!(connect_timeout = nil)
-        Timeout.timeout(connect_timeout, Error::SocketTimeoutError) do
+      def connect!
+        Timeout.timeout(options[:connect_timeout], Error::SocketTimeoutError) do
           handle_errors { @tcp_socket.connect(::Socket.pack_sockaddr_in(port, host)) }
           @socket = OpenSSL::SSL::SSLSocket.new(@tcp_socket, context)
           @socket.hostname = @host_name
@@ -63,6 +60,7 @@ module Mongo
           self
         end
       end
+      private :connect!
 
       # Initializes a new SSL socket.
       #
@@ -73,7 +71,9 @@ module Mongo
       # @param [ Integer ] port The port number.
       # @param [ Float ] timeout The socket timeout value.
       # @param [ Integer ] family The socket family.
-      # @param [ Hash ] options The ssl options.
+      # @param [ Hash ] options The options.
+      #
+      # @option options [ Float ] :connect_timeout Connect timeout.
       #
       # @since 2.0.0
       def initialize(host, port, host_name, timeout, family, options = {})
@@ -83,6 +83,7 @@ module Mongo
         @tcp_socket = ::Socket.new(family, SOCK_STREAM, 0)
         @tcp_socket.setsockopt(IPPROTO_TCP, TCP_NODELAY, 1)
         set_socket_options(@tcp_socket)
+        connect!
       end
 
       # Read a single byte from the socket.
@@ -100,18 +101,6 @@ module Mongo
         end
       end
 
-      # This socket can only be used if the ssl socket (@socket) has been created.
-      #
-      # @example Is the socket connectable?
-      #   socket.connectable?
-      #
-      # @return [ true, false ] If the socket is connectable.
-      #
-      # @since 2.2.5
-      def connectable?
-        !!@socket
-      end
-
       private
 
       def verify_certificate?
@@ -213,6 +202,10 @@ module Mongo
         # Capped at 16k due to https://linux.die.net/man/3/ssl_read
         16384
       end
+
+      def address
+        "#{host}:#{port} (#{host_name}:#{port}, TLS)"
+      end
     end
   end
 end