mongo 2.7.2 → 2.8.0.rc0

data/lib/mongo/operation/get_more/command.rb

@@ -26,22 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::GetMore::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/indexes/command.rb

@@ -26,22 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Indexes::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/indexes/legacy.rb

@@ -26,22 +26,6 @@ module Mongo
         include Executable
         include ReadPreferenceSupported
 
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Indexes::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Operation::Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
-
         private
 
         def selector(server)
@@ -51,6 +35,10 @@ module Mongo
         def message(server)
           Protocol::Query.new(db_name, Index::COLLECTION, command(server), options(server))
         end
+
+        def result_class
+          Operation::Result
+        end
       end
     end
   end

data/lib/mongo/operation/list_collections/command.rb

@@ -26,22 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::ListCollections::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/map_reduce/command.rb

@@ -27,22 +27,7 @@ module Mongo
         include Limited
         include ReadPreferenceSupported
         include WriteConcernSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::MapReduce::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/parallel_scan/command.rb

@@ -26,22 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::ParallelScan::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/result.rb

@@ -79,6 +79,9 @@ module Mongo
       # @return [ Array<Protocol::Reply> ] replies The wrapped wire protocol replies.
       attr_reader :replies
 
+      def_delegators :parser,
+        :not_master?, :node_recovering?
+
       # Is the result acknowledged?
       #
       # @note On MongoDB 2.6 and higher all writes are acknowledged since the

data/lib/mongo/operation/shared/executable.rb

@@ -45,6 +45,10 @@ module Mongo
 
       def process_result(result, server)
         server.update_cluster_time(result)
+        if result.not_master? || result.node_recovering?
+          server.unknown!
+          server.monitor.scan_semaphore.signal
+        end
         session.process(result) if session
         result
       end

data/lib/mongo/operation/shared/polymorphic_lookup.rb

@@ -25,7 +25,7 @@ module Mongo
       def polymorphic_class(base, name)
         bits = (base + "::#{name}").split('::')
         bits.reduce(Object) do |cls, name|
-          cls.const_get(name)
+          cls.const_get(name, false)
         end
       end
     end

data/lib/mongo/operation/shared/polymorphic_result.rb

@@ -18,6 +18,9 @@ module Mongo
     # Shared behavior of instantiating a result class matching the
     # operation class.
     #
+    # This module must be included after Executable module because result_class
+    # is defined in both.
+    #
     # @api private
     module PolymorphicResult
       include PolymorphicLookup
@@ -25,7 +28,11 @@ module Mongo
       private
 
       def result_class
-        polymorphic_class(self.class.name.sub(/::[^:]*$/, ''), :Result)
+        begin
+          polymorphic_class(self.class.name, :Result)
+        rescue NameError
+          polymorphic_class(self.class.name.sub(/::[^:]*$/, ''), :Result)
+        end
       end
     end
   end

data/lib/mongo/operation/shared/result/aggregatable.rb

@@ -68,8 +68,3 @@ module Mongo
     end
   end
 end
-
-
-
-
-

data/lib/mongo/operation/update/command.rb

@@ -27,21 +27,8 @@ module Mongo
         include Limited
         include WriteConcernSupported
         include BypassDocumentValidation
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Update::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-        end
+        include ExecutableNoValidate
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/update/legacy.rb

@@ -26,22 +26,7 @@ module Mongo
       class Legacy
         include Specifiable
         include Executable
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Update::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/operation/users_info/command.rb

@@ -26,22 +26,7 @@ module Mongo
         include Executable
         include Limited
         include ReadPreferenceSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::UsersInfo::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
+        include PolymorphicResult
 
         private
 

data/lib/mongo/retryable.rb

@@ -42,18 +42,22 @@ module Mongo
         attempt += 1
         yield
       rescue Error::SocketError, Error::SocketTimeoutError => e
-        raise(e) if attempt > cluster.max_read_retries || (session && session.in_transaction?)
+        if attempt > cluster.max_read_retries || (session && session.in_transaction?)
+          raise
+        end
         log_retry(e)
         cluster.scan!(false)
         retry
       rescue Error::OperationFailure => e
         if cluster.sharded? && e.retryable? && !(session && session.in_transaction?)
-          raise(e) if attempt > cluster.max_read_retries
+          if attempt > cluster.max_read_retries
+            raise
+          end
           log_retry(e)
           sleep(cluster.read_retry_interval)
           retry
         else
-          raise e
+          raise
         end
       end
     end
@@ -141,10 +145,14 @@ module Mongo
         txn_num = session.in_transaction? ? session.txn_num : session.next_txn_num
         yield(server, txn_num, false)
       rescue Error::SocketError, Error::SocketTimeoutError => e
-        raise e if session.in_transaction? && !ending_transaction
+        if session.in_transaction? && !ending_transaction
+          raise
+        end
         retry_write(e, txn_num, &block)
       rescue Error::OperationFailure => e
-        raise e if (session.in_transaction? && !ending_transaction) || !e.write_retryable?
+        if (session.in_transaction? && !ending_transaction) || !e.write_retryable?
+          raise
+        end
         retry_write(e, txn_num, &block)
       end
     end
@@ -167,17 +175,19 @@ module Mongo
     end
 
     def retry_write(original_error, txn_num, &block)
-      cluster.scan!(false)
+      # We do not request a scan of the cluster here, because error handling
+      # for the error which triggered the retry should have updated the
+      # server description and/or topology as necessary (specifically,
+      # a socket error or a not master error should have marked the respective
+      # server unknown). Here we just need to wait for server selection.
       server = cluster.next_primary
       raise original_error unless (server.retry_writes? && txn_num)
       log_retry(original_error)
       yield(server, txn_num, true)
     rescue Error::SocketError, Error::SocketTimeoutError => e
-      cluster.scan!(false)
       raise e
     rescue Error::OperationFailure => e
       raise original_error unless e.write_retryable?
-      cluster.scan!(false)
       raise e
     rescue
       raise original_error
@@ -193,13 +203,15 @@ module Mongo
         yield(server || cluster.next_primary)
       rescue Error::OperationFailure => e
         server = nil
-        raise(e) if attempt > Cluster::MAX_WRITE_RETRIES
+        if attempt > Cluster::MAX_WRITE_RETRIES
+          raise
+        end
         if e.write_retryable? && !(session && session.in_transaction?)
           log_retry(e)
           cluster.scan!(false)
           retry
         else
-          raise(e)
+          raise
         end
       end
     end

data/lib/mongo/server.rb

@@ -67,6 +67,7 @@ module Mongo
         start_monitoring
       end
       @connected = true
+      @pool_lock = Mutex.new
     end
 
     # @return [ String ] The configured address for the server.
@@ -280,7 +281,13 @@ module Mongo
     #
     # @since 2.0.0
     def pool
-      @pool ||= cluster.pool(self)
+      @pool_lock.synchronize do
+        @pool ||= begin
+          ConnectionPool.new(options) do |generation|
+            Connection.new(self, options.merge(generation: generation))
+          end
+        end
+      end
     end
 
     # Determine if the provided tags are a subset of the server's tags.
@@ -401,6 +408,8 @@ end
 
 require 'mongo/server/app_metadata'
 require 'mongo/server/connectable'
+require 'mongo/server/connection_base'
+require 'mongo/server/pending_connection'
 require 'mongo/server/connection'
 require 'mongo/server/connection_pool'
 require 'mongo/server/context'

data/lib/mongo/server/app_metadata.rb

@@ -32,14 +32,19 @@ module Mongo
 
       # The max application name byte size.
       #
-      # @ since 2.4.0
+      # @since 2.4.0
       MAX_APP_NAME_SIZE = 128.freeze
 
       # The driver name.
       #
-      # @ since 2.4.0
+      # @since 2.4.0
       DRIVER_NAME = 'mongo-ruby-driver'
 
+      # Option keys that affect auth mechanism negotiation.
+      #
+      # @api private
+      AUTH_OPTION_KEYS = [:user, :auth_source, :auth_mech].freeze
+
       # Instantiate the new AppMetadata object.
       #
       # @api private

data/lib/mongo/server/connectable.rb

@@ -34,12 +34,6 @@ module Mongo
       #   Will be removed in driver version 3.0.
       TIMEOUT = 5.freeze
 
-      # @return [ Mongo::Address ] address The address to connect to.
-      attr_reader :address
-
-      # @return [ Hash ] options The passed in options.
-      attr_reader :options
-
       # @return [ Integer ] pid The process id when the connection was created.
       attr_reader :pid