mongo 2.11.2 → 2.13.0.beta1

data/lib/mongo/protocol/update.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/retryable.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2015-2019 MongoDB, Inc.
+# Copyright (C) 2015-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -144,7 +144,7 @@ module Mongo
     # @note This only retries read operations on socket errors.
     #
     # @param [ Hash ] options Options.
-    # @param [ Proc ] block The block to execute.
+    # @yield Calls the provided block with no arguments
     #
     # @option options [ String ] :retry_message Message to log when retrying.
     #
@@ -221,7 +221,7 @@ module Mongo
       rescue Error::SocketError, Error::SocketTimeoutError => e
         e.add_note('modern retry')
         e.add_note("attempt 1")
-        if session.in_transaction? && !ending_transaction
+        if !e.label?('RetryableWriteError')
           raise e
         end
         retry_write(e, session, txn_num, &block)
@@ -230,7 +230,7 @@ module Mongo
         e.add_note("attempt 1")
         if e.unsupported_retryable_write?
           raise_unsupported_error(e)
-        elsif (session.in_transaction? && !ending_transaction) || !e.write_retryable?
+        elsif !e.label?('RetryableWriteError')
           raise e
         end
 
@@ -298,7 +298,7 @@ module Mongo
         if attempt > client.max_write_retries
           raise e
         end
-        if e.write_retryable? && !(session && session.in_transaction?)
+        if e.label?('RetryableWriteError')
           log_retry(e, message: 'Legacy write retry')
           cluster.scan!(false)
           retry
@@ -381,9 +381,11 @@ module Mongo
     def retry_read(original_error, server_selector, session, &block)
       begin
         server = select_server(cluster, server_selector, session)
-      rescue => e
+      rescue Error, Error::AuthError => e
         original_error.add_note("later retry failed: #{e.class}: #{e}")
-        raise original_error
+
+        # See the corresponding note below in retry_write.
+        raise Error::RaiseOriginalError
       end
 
       log_retry(original_error, message: 'Read retry')
@@ -402,11 +404,13 @@ module Mongo
         end
         e.add_note("attempt 2")
         raise e
-      rescue => e
+      rescue Error, Error::AuthError => e
         e.add_note('modern retry')
         original_error.add_note("later retry failed: #{e.class}: #{e}")
         raise original_error
       end
+    rescue Error::RaiseOriginalError
+      raise original_error
     end
 
     def retry_write(original_error, session, txn_num, &block)
@@ -420,7 +424,14 @@ module Mongo
         # Do not need to add "modern retry" here, it should already be on
         # the first exception.
         original_error.add_note('did not retry because server selected for retry does not supoprt retryable writes')
-        raise original_error
+
+        # When we want to raise the original error, we must not run the
+        # rescue blocks below that add diagnostics because the diagnostics
+        # added would either be rendundant (e.g. modern retry note) or wrong
+        # (e.g. "attempt 2", we are raising the exception produced in the
+        # first attempt and haven't attempted the second time). Use the
+        # special marker class to bypass the ordinarily applicable rescues.
+        raise Error::RaiseOriginalError
       end
       log_retry(original_error, message: 'Write retry')
       yield(server, txn_num, true)
@@ -430,18 +441,20 @@ module Mongo
       raise e
     rescue Error::OperationFailure => e
       e.add_note('modern retry')
-      if e.write_retryable?
+      if e.label?('RetryableWriteError')
         e.add_note('attempt 2')
         raise e
       else
         original_error.add_note("later retry failed: #{e.class}: #{e}")
         raise original_error
       end
-    rescue => e
+    rescue Error, Error::AuthError => e
       # Do not need to add "modern retry" here, it should already be on
       # the first exception.
       original_error.add_note("later retry failed: #{e.class}: #{e}")
       raise original_error
+    rescue Error::RaiseOriginalError
+      raise original_error
     end
 
     # This is a separate method to make it possible for the test suite to

data/lib/mongo/semaphore.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2018-2019 MongoDB, Inc.
+# Copyright (C) 2018-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

data/lib/mongo/server.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -72,6 +72,7 @@ module Mongo
         @monitor = Monitor.new(self, event_listeners, monitoring,
           options.merge(
             app_metadata: Monitor::AppMetadata.new(cluster.options),
+            heartbeat_interval: cluster.heartbeat_interval,
         ))
         unless _monitor == false
           start_monitoring
@@ -121,14 +122,21 @@ module Mongo
     # @deprecated
     alias :heartbeat_frequency_seconds :heartbeat_frequency
 
+    # Performs an immediate, synchronous check of the server.
+    #
     # @deprecated
     def_delegators :monitor, :scan!
 
-    # The last compressor discovered by the server monitor.
+    # The compressor negotiated by the server monitor, if any.
+    #
+    # This attribute is nil if no server check has not yet completed, and if
+    # no compression was negatiated.
+    #
+    # @note Compression is negotiated for each connection separately.
     #
-    # The compressor state should be determined for each individual
-    # connection rather than kept per server. A future version of the
-    # driver will change how compressors are tracked and used.
+    # @return [ String | nil ] The negotiated compressor.
+    #
+    # @deprecated
     def compressor
       if monitor
         monitor.compressor
@@ -423,8 +431,8 @@ module Mongo
     # @api private
     def handle_handshake_failure!
       yield
-    rescue Mongo::Error::SocketError, Mongo::Error::SocketTimeoutError
-      unknown!
+    rescue Mongo::Error::SocketError, Mongo::Error::SocketTimeoutError => e
+      unknown!(generation: e.generation)
       raise
     end
 
@@ -445,9 +453,9 @@ module Mongo
     rescue Mongo::Error::SocketTimeoutError
       # possibly cluster is slow, do not give up on it
       raise
-    rescue Mongo::Error::SocketError
+    rescue Mongo::Error::SocketError => e
       # non-timeout network error
-      unknown!
+      unknown!(generation: e.generation)
       raise
     rescue Auth::Unauthorized
       # auth error, keep server description and topology as they are
@@ -480,19 +488,42 @@ module Mongo
     # Marks server unknown and publishes the associated SDAM event
     # (server description changed).
     #
+    # If the generation is passed in options, the server will only be marked
+    # unknown if the passed generation is no older than the current generation
+    # of the server's connection pool.
+    #
     # @param [ Hash ] options Options.
     #
+    # @option options [ Integer ] :generation Connection pool generation of
+    #   the connection that was used for the operation that produced the error.
     # @option options [ true | false ] :keep_connection_pool Usually when the
     #   new server description is unknown, the connection pool on the
     #   respective server is cleared. Set this option to true to keep the
     #   existing connection pool (required when handling not master errors
     #   on 4.2+ servers).
+    # @option options [ TopologyVersion ] :topology_version Topology version
+    #   of the error response that is causing the server to be marked unknown.
     #
     # @since 2.4.0, SDAM events are sent as of version 2.7.0
     def unknown!(options = {})
+      if options[:generation] && options[:generation] < pool.generation
+        return
+      end
+
+      if options[:topology_version] && description.topology_version &&
+        !options[:topology_version].gt?(description.topology_version)
+      then
+        return
+      end
+
       # SDAM flow will update description on the server without in-place
       # mutations and invoke SDAM transitions as needed.
-      cluster.run_sdam_flow(description, Description.new(address), options)
+      config = {}
+      if options[:topology_version]
+        config['topologyVersion'] = options[:topology_version]
+      end
+      new_description = Description.new(address, config)
+      cluster.run_sdam_flow(description, new_description, options)
     end
 
     # @api private
@@ -522,7 +553,7 @@ module Mongo
 end
 
 require 'mongo/server/app_metadata'
-require 'mongo/server/connectable'
+require 'mongo/server/connection_common'
 require 'mongo/server/connection_base'
 require 'mongo/server/pending_connection'
 require 'mongo/server/connection'

data/lib/mongo/server/app_metadata.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2019 MongoDB, Inc.
+# Copyright (C) 2016-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -88,10 +88,16 @@ module Mongo
       # @return [ String ] The raw bytes.
       #
       # @since 2.4.0
+      # @deprecated
       def ismaster_bytes
         @ismaster_bytes ||= validate! && serialize.to_s
       end
 
+      def validated_document
+        validate!
+        document
+      end
+
       private
 
       def validate!
@@ -162,11 +168,18 @@ module Mongo
       end
 
       def platform
+        if BSON::Environment.jruby?
+          ruby_versions = ["JRuby #{JRUBY_VERSION}", "like Ruby #{RUBY_VERSION}"]
+          platforms = [RUBY_PLATFORM, "JVM #{java.lang.System.get_property('java.version')}"]
+        else
+          ruby_versions = ["Ruby #{RUBY_VERSION}"]
+          platforms = [RUBY_PLATFORM]
+        end
         [
           @platform,
-          RUBY_VERSION,
-          RUBY_PLATFORM,
-          RbConfig::CONFIG['build']
+          *ruby_versions,
+          *platforms,
+          RbConfig::CONFIG['build'],
         ].compact.join(', ')
       end
     end

data/lib/mongo/server/connection.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2019 MongoDB, Inc.
+# Copyright (C) 2014-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ module Mongo
     #
     # @since 2.0.0
     class Connection < ConnectionBase
-      include Connectable
       include Monitoring::Publishable
       include Retryable
       extend Forwardable
@@ -103,12 +102,6 @@ module Mongo
         )
       end
 
-      # @return [ Server::Description ] The server description obtained from
-      #   the handshake on this connection.
-      #
-      # @api private
-      attr_reader :description
-
       # @return [ Time ] The last time the connection was checked back into a pool.
       #
       # @since 2.5.0
@@ -120,15 +113,6 @@ module Mongo
       # @since 2.9.0
       attr_reader :id
 
-      # Connection pool generation from which this connection was created.
-      # May be nil.
-      #
-      # @since 2.7.0
-      # @api private
-      def generation
-        options[:generation]
-      end
-
       # The connection pool from which this connection was created.
       # May be nil.
       #
@@ -149,6 +133,11 @@ module Mongo
         !!@closed
       end
 
+      # @api private
+      def error?
+        !!@error
+      end
+
       # Establishes a network connection to the target address.
       #
       # If the connection is already established, this method does nothing.
@@ -163,18 +152,18 @@ module Mongo
       #
       # @since 2.0.0
       def connect!
+        if error?
+          raise Error::ConnectionPerished, "Connection #{generation}:#{id} for #{address.seed} is perished. Reconnecting closed or errored connections is no longer supported"
+        end
+
         if closed?
-          if Lint.enabled?
-            raise Error::LintError, "Reconnecting closed connections is no longer supported (for #{address})"
-          else
-            log_warn("Reconnecting closed connections is deprecated (for #{address})")
-          end
+          raise Error::ConnectionPerished, "Connection #{generation}:#{id} for #{address.seed} is closed. Reconnecting closed or errored connections is no longer supported"
         end
 
         unless @socket
           # When @socket is assigned, the socket should have handshaken and
           # authenticated and be usable.
-          @socket = do_connect
+          @socket, @description = do_connect
 
           publish_cmap_event(
             Monitoring::Event::Cmap::ConnectionReady.new(address, id)
@@ -186,24 +175,27 @@ module Mongo
       end
 
       # Separate method to permit easier mocking in the test suite.
-      def do_connect
-        socket = address.socket(socket_timeout, ssl_options,
-          connect_timeout: address.connect_timeout)
+      #
+      # @return [ Array<Socket, Server::Description> ] Connected socket and
+      #   a server description instance from the ismaster response of the
+      #   returned socket.
+      private def do_connect
+        socket = add_server_diagnostics do
+          address.socket(socket_timeout, ssl_options.merge(
+            connection_address: address, connection_generation: generation))
+        end
 
         begin
-          handshake!(socket)
-          unless description.arbiter?
-            pending_connection = PendingConnection.new(socket, @server, monitoring, options.merge(id: id))
-            authenticate!(pending_connection)
-          end
+          pending_connection = PendingConnection.new(
+            socket, @server, monitoring, options.merge(id: id))
+          pending_connection.handshake_and_authenticate!
         rescue Exception
           socket.close
           raise
         end
 
-        socket
+        [socket, pending_connection.description]
       end
-      private :do_connect
 
       # Disconnect the connection.
       #
@@ -269,17 +261,16 @@ module Mongo
       def ping
         bytes = features.op_msg_enabled? ? PING_OP_MSG_BYTES : PING_BYTES
         ensure_connected do |socket|
-          socket.write(bytes)
-          reply = Protocol::Message.deserialize(socket, max_message_size)
+          reply = add_server_diagnostics do
+            socket.write(bytes)
+            Protocol::Message.deserialize(socket, max_message_size)
+          end
           reply.documents[0][Operation::Result::OK] == 1
         end
       end
 
       # Get the timeout to execute an operation on a socket.
       #
-      # @example Get the timeout to execute an operation on a socket.
-      #   connection.timeout
-      #
       # @return [ Float ] The operation timeout in seconds.
       #
       # @since 2.0.0
@@ -304,98 +295,21 @@ module Mongo
 
       private
 
-      def handshake!(socket)
-        unless socket
-          raise Error::HandshakeError, "Cannot handshake because there is no usable socket (for #{address})"
-        end
-
-        response = average_rtt = nil
-        @server.handle_handshake_failure! do
-          begin
-            response, exc, rtt, average_rtt =
-              @server.round_trip_time_averager.measure do
-                socket.write(app_metadata.ismaster_bytes)
-                Protocol::Message.deserialize(socket, max_message_size).documents[0]
-              end
-
-            if exc
-              raise exc
-            end
-          rescue => e
-            log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
-            raise
-          end
-        end
-
-        post_handshake(response, average_rtt)
-      end
-
-      # This is a separate method to keep the nesting level down.
-      def post_handshake(response, average_rtt)
-        if response["ok"] == 1
-          # Auth mechanism is entirely dependent on the contents of
-          # ismaster response *for this connection*.
-          # Ismaster received by the monitoring connection should advertise
-          # the same wire protocol, but if it doesn't, we use whatever
-          # the monitoring connection advertised for filling out the
-          # server description and whatever the non-monitoring connection
-          # (that's this one) advertised for performing auth on that
-          # connection.
-          @auth_mechanism = if response['saslSupportedMechs']
-            if response['saslSupportedMechs'].include?(Mongo::Auth::SCRAM::SCRAM_SHA_256_MECHANISM)
-              :scram256
-            else
-              :scram
-            end
-          else
-            # MongoDB servers < 2.6 are no longer suported.
-            # Wire versions should always be returned in ismaster.
-            # See also https://jira.mongodb.org/browse/RUBY-1584.
-            min_wire_version = response[Description::MIN_WIRE_VERSION]
-            max_wire_version = response[Description::MAX_WIRE_VERSION]
-            features = Description::Features.new(min_wire_version..max_wire_version)
-            if features.scram_sha_1_enabled?
-              :scram
-            else
-              :mongodb_cr
-            end
-          end
-        else
-          @auth_mechanism = nil
-        end
-
-        @description = Description.new(address, response, average_rtt)
-        @server.cluster.run_sdam_flow(@server.description, @description)
-      end
-
-      def authenticate!(pending_connection)
-        if options[:user] || options[:auth_mech]
-          user_options = Options::Redacted.new(:auth_mech => default_mechanism).merge(options)
-          if user_options[:auth_mech] == :mongodb_x509
-            user_options[:auth_source] = '$external'
-          end
-          user = Auth::User.new(user_options)
-          @server.handle_auth_failure! do
-            begin
-              Auth.get(user).login(pending_connection)
-            rescue => e
-              log_warn("Failed to handshake with #{address}: #{e.class}: #{e}")
-              raise
-            end
-          end
+      def deliver(message, client, options = {})
+        handle_errors do
+          super
         end
       end
 
-      def default_mechanism
-        @auth_mechanism || (@server.features.scram_sha_1_enabled? ? :scram : :mongodb_cr)
-      end
-
-      def deliver(message)
+      def handle_errors
         begin
-          super
-        # Important: timeout errors are not handled here
-        rescue Error::SocketError
-          @server.unknown!
+          yield
+        rescue Error::SocketError => e
+          @error = e
+          @server.unknown!(generation: e.generation)
+          raise
+        rescue Error::SocketTimeoutError => e
+          @error = e
           raise
         end
       end