mongo 2.7.2 → 2.8.0.rc0

data/lib/mongo/auth/x509/conversation.rb

@@ -51,7 +51,7 @@ module Mongo
         end
 
         # Start the x.509 conversation. This returns the first message that
-        # needs to be send to the server.
+        # needs to be sent to the server.
         #
         # @example Start the conversation.
         #   conversation.start
@@ -95,7 +95,9 @@ module Mongo
         private
 
         def validate!(reply)
-          raise Unauthorized.new(user) if reply.documents[0][Operation::Result::OK] != 1
+          if reply.documents[0][Operation::Result::OK] != 1
+            raise Unauthorized.new(user, MECHANISM)
+          end
           @reply = reply
         end
       end

data/lib/mongo/cluster.rb

@@ -99,7 +99,6 @@ module Mongo
       @app_metadata = Server::AppMetadata.new(@options)
       @update_lock = Mutex.new
       @sdam_flow_lock = Mutex.new
-      @pool_lock = Mutex.new
       @cluster_time = nil
       @cluster_time_lock = Mutex.new
       @topology = Topology.initial(self, monitoring, options)
@@ -153,7 +152,7 @@ module Mongo
       @periodic_executor = PeriodicExecutor.new(@cursor_reaper, @socket_reaper)
       @periodic_executor.run!
 
-      ObjectSpace.define_finalizer(self, self.class.finalize(pools, @periodic_executor, @session_pool))
+      ObjectSpace.define_finalizer(self, self.class.finalize({}, @periodic_executor, @session_pool))
 
       @connecting = false
       @connected = true
@@ -341,15 +340,16 @@ module Mongo
     end
 
     # @api private
-    attr_reader :server_selection_semaphore
+    def server_selection_semaphore
+      options[:server_selection_semaphore]
+    end
 
-    # Finalize the cluster for garbage collection. Disconnects all the scoped
-    # connection pools.
+    # Finalize the cluster for garbage collection.
     #
     # @example Finalize the cluster.
     #   Cluster.finalize(pools)
     #
-    # @param [ Hash<Address, Server::ConnectionPool> ] pools The connection pools.
+    # @param [ Hash<Address, Server::ConnectionPool> ] pools Ignored.
     # @param [ PeriodicExecutor ] periodic_executor The periodic executor.
     # @param [ SessionPool ] session_pool The session pool.
     #
@@ -360,9 +360,6 @@ module Mongo
       proc do
         session_pool.end_sessions
         periodic_executor.stop!
-        pools.values.each do |pool|
-          pool.disconnect!
-        end
       end
     end
 
@@ -523,7 +520,7 @@ module Mongo
       @primary_selector.select_server(self)
     end
 
-    # Get the scoped connection pool for the server.
+    # Get the connection pool for the server.
     #
     # @example Get the connection pool.
     #   cluster.pool(server)
@@ -533,10 +530,9 @@ module Mongo
     # @return [ Server::ConnectionPool ] The connection pool.
     #
     # @since 2.2.0
+    # @deprecated
     def pool(server)
-      @pool_lock.synchronize do
-        pools[server.address] ||= Server::ConnectionPool.get(server)
-      end
+      server.pool
     end
 
     # Update the max cluster time seen in a response.
@@ -675,10 +671,6 @@ module Mongo
         false
       end
     end
-
-    def pools
-      @pools ||= {}
-    end
   end
 end
 

data/lib/mongo/error.rb

@@ -134,6 +134,7 @@ module Mongo
   end
 end
 
+require 'mongo/error/sdam_error_detection'
 require 'mongo/error/parser'
 require 'mongo/error/write_retryable'
 require 'mongo/error/change_stream_resumable'
@@ -179,6 +180,7 @@ require 'mongo/error/unchangeable_collection_option'
 require 'mongo/error/unexpected_chunk_length'
 require 'mongo/error/unexpected_response'
 require 'mongo/error/missing_file_chunk'
+require 'mongo/error/missing_password'
 require 'mongo/error/missing_resume_token'
 require 'mongo/error/unsupported_array_filters'
 require 'mongo/error/unknown_payload_type'

data/lib/mongo/error/missing_password.rb

@@ -0,0 +1,29 @@
+# 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 Error
+
+    # Raised when the operations that require a password (e.g. retrieving
+    # a salted or hashed password) are attempted on a User object that was
+    # not created with a password.
+    #
+    # @since 2.8.0
+    class MissingPassword < Error
+      def initialize(msg = nil)
+        super(msg || 'User was created without a password')
+      end
+    end
+  end
+end

data/lib/mongo/error/operation_failure.rb

@@ -20,6 +20,7 @@ module Mongo
     # @since 2.0.0
     class OperationFailure < Error
       extend Forwardable
+      include SdamErrorDetection
 
       # Error codes and code names that should result in a failing write
       # being retried.
@@ -28,7 +29,7 @@ module Mongo
       # @api private
       WRITE_RETRY_ERRORS = [
         {:code_name => 'InterruptedAtShutdown', :code => 11600},
-        {:code_name => 'InterruptedDueToReplStateChange', :code => 11602},
+        {:code_name => 'InterruptedDueToStepDown', :code => 11602},
         {:code_name => 'NotMaster', :code => 10107},
         {:code_name => 'NotMasterNoSlaveOk', :code => 13435},
         {:code_name => 'NotMasterOrSecondary', :code => 13436},
@@ -175,6 +176,9 @@ module Mongo
       #
       # @option options [ Integer ] :code Error code
       # @option options [ String ] :code_name Error code name
+      # @option options [ Array<String> ] :labels The set of labels associated
+      #   with the error
+      # @option options [ true | false ] :wtimeout Whether the error is a wtimeout
       #
       # @since 2.5.0, options added in 2.6.0
       def initialize(message = nil, result = nil, options = {})
@@ -186,9 +190,9 @@ module Mongo
         super(message)
       end
 
-      # Whether the error was a write concern timeout.
+      # Whether the error is a write concern timeout.
       #
-      # @return [ true | false ] Whether the error was a write concern timeout.
+      # @return [ true | false ] Whether the error is a write concern timeout.
       #
       # @since 2.7.1
       def wtimeout?

data/lib/mongo/error/parser.rb

@@ -44,6 +44,7 @@ module Mongo
     #
     # @since 2.0.0
     class Parser
+      include SdamErrorDetection
 
       # @return [ BSON::Document ] document The returned document.
       attr_reader :document
@@ -62,7 +63,7 @@ module Mongo
       # @since 2.6.0
       attr_reader :code_name
 
-      # @return [ Array ] labels The set of labels associated with the error.
+      # @return [ Array<String> ] labels The set of labels associated with the error.
       # @since 2.7.0
       attr_reader :labels
 

data/lib/mongo/error/sdam_error_detection.rb

@@ -0,0 +1,54 @@
+module Mongo
+  class Error
+    # @note Although not_master? and node_recovering? methods of this module
+    #   are part of the public API, the fact that these methods are defined on
+    #   this module and not on the classes which include this module is not
+    #   part of the public API.
+    #
+    # @api semipublic
+    module SdamErrorDetection
+
+      # @api private
+      NOT_MASTER_CODES = [10107, 13435].freeze
+
+      # @api private
+      NODE_RECOVERING_CODES = [11600, 11602, 13436, 189, 91].freeze
+
+      # Whether the error is a "not master" error, or one of its variants.
+      #
+      # See https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#not-master-and-node-is-recovering.
+      #
+      # @return [ true | false ] Whether the error is a not master.
+      #
+      # @since 2.8.0
+      def not_master?
+        if node_recovering?
+          false
+        elsif code && NOT_MASTER_CODES.include?(code)
+          true
+        elsif message
+          message.include?('not master')
+        else
+          false
+        end
+      end
+
+      # Whether the error is a "node is recovering" error, or one of its variants.
+      #
+      # See https://github.com/mongodb/specifications/blob/master/source/server-discovery-and-monitoring/server-discovery-and-monitoring.rst#not-master-and-node-is-recovering.
+      #
+      # @return [ true | false ] Whether the error is a node is recovering.
+      #
+      # @since 2.8.0
+      def node_recovering?
+        if code && NODE_RECOVERING_CODES.include?(code)
+          true
+        elsif message
+          message.include?('node is recovering') || message.include?('not master or secondary')
+        else
+          false
+        end
+      end
+    end
+  end
+end

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

@@ -24,26 +24,11 @@ module Mongo
       class Command
         include Specifiable
         include Executable
+        include PolymorphicResult
         include ReadPreferenceSupported
         include WriteConcernSupported
         include Limited
 
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Aggregate::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server))
-          process_result(result, server)
-          result.validate!
-        end
-
         private
 
         def write_concern_supported?(server)

data/lib/mongo/operation/aggregate/op_msg.rb

@@ -23,8 +23,8 @@ module Mongo
       # @since 2.5.2
       class OpMsg < OpMsgBase
         include CausalConsistencySupported
-        include PolymorphicResult
         include ExecutableTransactionLabel
+        include PolymorphicResult
       end
     end
   end

data/lib/mongo/operation/collections_info.rb

@@ -26,6 +26,7 @@ module Mongo
       include Specifiable
       include Executable
       include ReadPreferenceSupported
+      include PolymorphicResult
 
       # Execute the operation.
       #
@@ -43,9 +44,7 @@ module Mongo
           return Operation::ListCollections.new(spec).execute(server)
         end
 
-        result = Result.new(dispatch_message(server))
-        process_result(result, server)
-        result.validate!
+        super
       end
 
       private

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

@@ -26,21 +26,8 @@ module Mongo
         include Executable
         include Limited
         include WriteConcernSupported
-
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Delete::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/delete/legacy.rb

@@ -24,22 +24,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::Delete::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/explain/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::Explain::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/explain/legacy.rb

@@ -25,22 +25,7 @@ module Mongo
         include Specifiable
         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::Explain::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/find/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::Find::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/find/legacy.rb

@@ -27,22 +27,7 @@ module Mongo
         include Specifiable
         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::Find::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