mongo 2.13.0.beta1 → 2.13.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f5e58cfb13fc60fb774becdceb53b4c79cd1461a2cbd3f2dcfd44216f083da8
-  data.tar.gz: df770f62315fa3ef4db7a32d796c093759a38c1e6c4e6eaa183789b1700f5ed9
+  metadata.gz: db8c88ed58f349728a9361db891376926e93450f4a8ac86aae0bc67599c91a7b
+  data.tar.gz: b4f7daaf1d43b55839c1f689504d4f1c212c638e45f6d2211732bc07a41f77e5
 SHA512:
-  metadata.gz: a51aa55384766e936b0bbc4ad2f99c9fb22ad03d10e04a4f65a5492c16764c92495ae17c5e1ba521c96e3fe25c5b2d787ab985939947eeffd0957a54ceef4078
-  data.tar.gz: 6d8ca3220081914ec39479c4c9ebb4a6f070be7f4840fa98f0b6cf28f9c3a9c8082264e9b3b7b0d588cda54f97c9f687e36fd467576a396527d80b493c8a52e7
+  metadata.gz: 22471d116179fff42716707a40fa18ebc3c53492a6313bb16be96f447db725110b8ed0b3ee8e199026098a59b8f2941290cd1493249c8e9120ec2849e0229fa1
+  data.tar.gz: 8965e04c6926343e4363110d010e14b1a8fde146eb4e239f620005f251ff24b63393bc13f5f332ac4d8aa39cc790a66f080401d9b0923c54a8b40b7d80aa25ea

data.tar.gz.sig

@@ -1,5 +1 @@
-�⋎�L��`�*Vd��
-�J���5_E:���
-�&E�!��Z�E:���%-%sZY��_��5�o�����I�AB�׵X��������������R��7�88_}lB�<&06�.W�����eJu�A�
-M��QhuF-0�)��_b���y��i�9q
-Q��E:8�H��70'������º���q�<����[�_���[��k_s���� >��RՐ;�5iq.�[��~��'9�������%
+�7�$��7�NEQg��KLJ

data/Rakefile

@@ -45,16 +45,16 @@ namespace :spec do
     client = ClientRegistry.instance.global_client('authorized')
     client.database.command(ping: 1)
     deadline = Time.now + 300
-    while Time.now < deadline
-      if client.cluster.send(:sessions_supported?)
+    loop do
+      begin
+        client.cluster.validate_session_support!
         break
+      rescue Mongo::Error::SessionsNotSupported
+        if Time.now >= deadline
+          raise "Sessions did not become supported in 300 seconds"
+        end
+        client.cluster.scan!
       end
-      sleep 1
-      client.close
-      client.reconnect
-    end
-    unless client.cluster.send(:sessions_supported?)
-      raise "Sessions did not become supported in the allowed time"
     end
   end
 
@@ -71,7 +71,13 @@ namespace :spec do
     SpecConfig.instance.print_summary
   end
 
-  task :ci => ['spec:prepare', :spec]
+  task :ci => ['spec:prepare'] do
+    $: << File.join(File.dirname(__FILE__), 'spec')
+
+    require 'support/spec_organizer'
+
+    SpecOrganizer.new.run
+  end
 end
 
 namespace :release do

data/lib/mongo.rb

@@ -34,6 +34,7 @@ require 'bson'
 require 'mongo/id'
 require 'mongo/bson'
 require 'mongo/semaphore'
+require 'mongo/distinguishing_semaphore'
 require 'mongo/options'
 require 'mongo/loggable'
 require 'mongo/cluster_time'
@@ -54,9 +55,11 @@ require 'mongo/collection'
 require 'mongo/database'
 require 'mongo/crypt'
 require 'mongo/client' # Purposely out-of-order so that database is loaded first
+require 'mongo/client_encryption'
 require 'mongo/dbref'
 require 'mongo/grid'
 require 'mongo/index'
+require 'mongo/lint'
 require 'mongo/server'
 require 'mongo/server_selector'
 require 'mongo/session'
@@ -66,5 +69,4 @@ require 'mongo/timeout'
 require 'mongo/uri'
 require 'mongo/version'
 require 'mongo/write_concern'
-require 'mongo/lint'
-require 'mongo/client_encryption'
+require 'mongo/utils'

data/lib/mongo/auth/aws/request.rb

@@ -12,7 +12,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-autoload :Net, 'net/http'
+module Net
+  autoload :HTTP, 'net/http'
+end
 
 module Mongo
   module Auth
@@ -86,7 +88,7 @@ module Mongo
         # @return [ String ] formatted_time ISO8601-formatted time of the
         #   request, as would be used in X-Amz-Date header.
         def formatted_time
-          @formatted_time ||= @time.utc.strftime('%Y%m%dT%H%M%SZ')
+          @formatted_time ||= @time.getutc.strftime('%Y%m%dT%H%M%SZ')
         end
 
         # @return [ String ] formatted_date YYYYMMDD formatted date of the request.

data/lib/mongo/bulk_write.rb

@@ -170,6 +170,7 @@ module Mongo
         :ordered => ordered?,
         :operation_id => operation_id,
         :bypass_document_validation => !!options[:bypass_document_validation],
+        :max_time_ms => options[:max_time_ms],
         :options => options,
         :id_generator => client.options[:id_generator],
         :session => session

data/lib/mongo/client.rb

@@ -55,6 +55,7 @@ module Mongo
       :auth_mech_properties,
       :auth_source,
       :auto_encryption_options,
+      :bg_error_backtrace,
       :cleanup,
       :compressors,
       :direct_connection,
@@ -213,6 +214,10 @@ module Mongo
     #   use. One of :mongodb_cr, :mongodb_x509, :plain, :scram, :scram256
     # @option options [ Hash ] :auth_mech_properties
     # @option options [ String ] :auth_source The source to authenticate from.
+    # @option options [ true | false | nil | Integer ] :bg_error_backtrace
+    #   Experimental. Set to true to log complete backtraces for errors in
+    #   background threads. Set to false or nil to not log backtraces. Provide
+    #   a positive integer to log up to that many backtrace lines.
     # @option options [ Array<String> ] :compressors A list of potential
     #   compressors to use, in order of preference. The driver chooses the
     #   first compressor that is also supported by the server. Currently the
@@ -443,6 +448,12 @@ module Mongo
         @srv_records = uri.srv_records
       else
         addresses = addresses_or_uri
+        addresses.each do |addr|
+          if addr =~ /\Amongodb(\+srv)?:\/\//i
+            raise ArgumentError, "Host '#{addr}' should not contain protocol. Did you mean to not use an array?"
+          end
+        end
+
         @srv_records = nil
       end
 
@@ -489,7 +500,6 @@ module Mongo
           end
         end
 
-        yield(self) if block_given?
       rescue
         begin
           @cluster.disconnect!
@@ -499,6 +509,14 @@ module Mongo
         end
         raise
       end
+
+      if block_given?
+        begin
+          yield(self)
+        ensure
+          close
+        end
+      end
     end
 
     # @api private
@@ -802,6 +820,13 @@ module Mongo
     # @param [ Hash ] filter The filter criteria for getting a list of databases.
     # @param [ Hash ] opts The command options.
     #
+    # @option opts [ true, false ] :authorized_databases A flag that determines
+    #   which databases are returned based on user privileges when access control
+    #   is enabled
+    #
+    #   See https://docs.mongodb.com/manual/reference/command/listDatabases/
+    #   for more information and usage.
+    #
     # @return [ Array<String> ] The names of the databases.
     #
     # @since 2.0.5
@@ -818,6 +843,13 @@ module Mongo
     # @param [ true, false ] name_only Whether to only return each database name without full metadata.
     # @param [ Hash ] opts The command options.
     #
+    # @option opts [ true, false ] :authorized_databases A flag that determines
+    #   which databases are returned based on user privileges when access control
+    #   is enabled
+    #
+    #   See https://docs.mongodb.com/manual/reference/command/listDatabases/
+    #   for more information and usage.
+    #
     # @return [ Array<Hash> ] The info for each database.
     #
     # @since 2.0.5
@@ -825,6 +857,7 @@ module Mongo
       cmd = { listDatabases: 1 }
       cmd[:nameOnly] = !!name_only
       cmd[:filter] = filter unless filter.empty?
+      cmd[:authorizedDatabases] = true if opts[:authorized_databases]
       use(Database::ADMIN).database.read_command(cmd, opts).first[Database::DATABASES]
     end
 
@@ -865,8 +898,16 @@ module Mongo
     #
     # @since 2.5.0
     def start_session(options = {})
-      get_session(options.merge(implicit: false)) or
-        raise Error::InvalidSession.new(Session::SESSIONS_NOT_SUPPORTED)
+      session = get_session!(options.merge(implicit: false))
+      if block_given?
+        begin
+          yield session
+        ensure
+          session.end_session
+        end
+      else
+        session
+      end
     end
 
     # As of version 3.6 of the MongoDB server, a ``$changeStream`` pipeline stage is supported
@@ -912,6 +953,59 @@ module Mongo
         options)
     end
 
+    # Returns a session to use for operations if possible.
+    #
+    # If :session option is set, validates that session and returns it.
+    # Otherwise, if deployment supports sessions, creates a new session and
+    # returns it. When a new session is created, the session will be implicit
+    # (lifecycle is managed by the driver) if the :implicit option is given,
+    # otherwise the session will be explicit (lifecycle managed by the
+    # application). If deployment does not support session, returns nil.
+    #
+    # @option options [ true | false ] :implicit When no session is passed in,
+    #   whether to create an implicit session.
+    # @option options [ Session ] :session The session to validate and return.
+    #
+    # @return [ Session | nil ] Session object or nil if sessions are not
+    #   supported by the deployment.
+    #
+    # @api private
+    def get_session(options = {})
+      get_session!(options)
+    rescue Error::SessionsNotSupported
+      nil
+    end
+
+    # Creates a session to use for operations if possible and yields it to
+    # the provided block.
+    #
+    # If :session option is set, validates that session and uses it.
+    # Otherwise, if deployment supports sessions, creates a new session and
+    # uses it. When a new session is created, the session will be implicit
+    # (lifecycle is managed by the driver) if the :implicit option is given,
+    # otherwise the session will be explicit (lifecycle managed by the
+    # application). If deployment does not support session, yields nil to
+    # the block.
+    #
+    # When the block finishes, if the session was created and was implicit,
+    # or if an implicit session was passed in, the session is ended which
+    # returns it to the pool of available sessions.
+    #
+    # @option options [ true | false ] :implicit When no session is passed in,
+    #   whether to create an implicit session.
+    # @option options [ Session ] :session The session to validate and return.
+    #
+    # @api private
+    def with_session(options = {}, &block)
+      session = get_session(options)
+
+      yield session
+    ensure
+      if session && session.implicit?
+        session.end_session
+      end
+    end
+
     private
 
     # Create a new encrypter object using the client's auto encryption options
@@ -944,30 +1038,34 @@ module Mongo
       close_encrypter
     end
 
-    # If options[:session] is set, validates that session and returns it.
-    # If deployment supports sessions, creates a new session and returns it.
-    # The session is implicit unless options[:implicit] is given.
-    # If deployment does not support session, returns nil.
+    # Returns a session to use for operations.
     #
-    # @return [ Session | nil ] Session object or nil if sessions are not
-    #   supported by the deployment.
-    def get_session(options = {})
+    # If :session option is set, validates that session and returns it.
+    # Otherwise, if deployment supports sessions, creates a new session and
+    # returns it. When a new session is created, the session will be implicit
+    # (lifecycle is managed by the driver) if the :implicit option is given,
+    # otherwise the session will be explicit (lifecycle managed by the
+    # application). If deployment does not support session, raises
+    # Error::InvalidSession.
+    #
+    # @option options [ true | false ] :implicit When no session is passed in,
+    #   whether to create an implicit session.
+    # @option options [ Session ] :session The session to validate and return.
+    #
+    # @return [ Session ] A session object.
+    #
+    # @raise Error::SessionsNotSupported if sessions are not supported by
+    #   the deployment.
+    #
+    # @api private
+    def get_session!(options = {})
       if options[:session]
         return options[:session].validate!(self)
       end
 
-      if cluster.sessions_supported?
-        Session.new(cluster.session_pool.checkout, self, { implicit: true }.merge(options))
-      end
-    end
+      cluster.validate_session_support!
 
-    def with_session(options = {}, &block)
-      session = get_session(options)
-      yield(session)
-    ensure
-      if session && session.implicit?
-        session.end_session
-      end
+      Session.new(cluster.session_pool.checkout, self, { implicit: true }.merge(options))
     end
 
     def initialize_copy(original)
@@ -1038,6 +1136,30 @@ module Mongo
       if options[:direct_connection] == false && options[:connect] && options[:connect].to_sym == :direct
         raise ArgumentError, "Conflicting client options: direct_connection=false and connect=#{options[:connect]}"
       end
+
+      %i(connect_timeout socket_timeout).each do |key|
+        if value = options[key]
+          unless Numeric === value
+            raise ArgumentError, "#{key} must be a non-negative number: #{value}"
+          end
+          if value < 0
+            raise ArgumentError, "#{key} must be a non-negative number: #{value}"
+          end
+        end
+      end
+
+      if value = options[:bg_error_backtrace]
+        case value
+        when Integer
+          if value <= 0
+            raise ArgumentError, ":bg_error_backtrace option value must be true, false, nil or a positive integer: #{value}"
+          end
+        when true
+          # OK
+        else
+          raise ArgumentError, ":bg_error_backtrace option value must be true, false, nil or a positive integer: #{value}"
+        end
+      end
     end
 
     # Validates all authentication-related options after they are set on the client

data/lib/mongo/cluster.rb

@@ -395,7 +395,7 @@ module Mongo
     #
     # @since 2.0.0
     def servers
-      topology.servers(servers_list.compact).compact
+      topology.servers(servers_list)
     end
 
     # The addresses in the cluster.
@@ -599,11 +599,14 @@ module Mongo
     #   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 aptions [ true | false ] :awaited Whether the updated description
+    #   was a result of processing an awaited ismaster.
     #
     # @api private
     def run_sdam_flow(previous_desc, updated_desc, options = {})
       @sdam_flow_lock.synchronize do
-        flow = SdamFlow.new(self, previous_desc, updated_desc)
+        flow = SdamFlow.new(self, previous_desc, updated_desc,
+          awaited: options[:awaited])
         flow.server_description_changed
 
         # SDAM flow may alter the updated description - grab the final
@@ -886,21 +889,26 @@ module Mongo
       end
     end
 
-    # Returns whether the deployment that the driver is connected to supports
-    # sessions.
+    # Raises Error::SessionsNotAvailable if the deployment that the driver
+    # is connected to does not support sessions.
     #
     # Session support may change over time, for example due to servers in the
-    # deployment being upgraded or downgraded. This method returns the
-    # current information if the client is connected to at least one data
-    # bearing server. If the client is currently not connected to any data
-    # bearing servers, this method returns the last known value for whether
-    # the deployment supports sessions.
+    # deployment being upgraded or downgraded. If the client is currently not
+    # connected to any data bearing servers, this method considers the state
+    # of session support as of when the client was last connected to at
+    # least one server. If the client has never connected to any servers,
+    # the deployment is considered to not support sessions.
     #
-    # @return [ true | false ] Whether deployment supports sessions.
     # @api private
-    def sessions_supported?
-      if topology.data_bearing_servers?
-        return !!topology.logical_session_timeout
+    def validate_session_support!
+      @state_change_lock.synchronize do
+        @sdam_flow_lock.synchronize do
+          if topology.data_bearing_servers?
+            unless topology.logical_session_timeout
+              raise_sessions_not_supported
+            end
+          end
+        end
       end
 
       # No data bearing servers known - perform server selection to try to
@@ -908,12 +916,24 @@ module Mongo
       # assessment of whether sessions are currently supported.
       begin
         ServerSelector.get(mode: :primary_preferred).select_server(self)
-        !!topology.logical_session_timeout
+        @state_change_lock.synchronize do
+          @sdam_flow_lock.synchronize do
+            unless topology.logical_session_timeout
+              raise_sessions_not_supported
+            end
+          end
+        end
       rescue Error::NoServerAvailable
         # We haven't been able to contact any servers - use last known
-        # value for esssion support.
-        @update_lock.synchronize do
-          @sessions_supported || false
+        # value for session support.
+        @state_change_lock.synchronize do
+          @sdam_flow_lock.synchronize do
+            @update_lock.synchronize do
+              unless @sessions_supported
+                raise_sessions_not_supported
+              end
+            end
+          end
         end
       end
     end
@@ -952,6 +972,22 @@ module Mongo
         end
       end
     end
+
+    def raise_sessions_not_supported
+      # Intentionally using @servers instead of +servers+ here because we
+      # are supposed to be already holding the @update_lock and we cannot
+      # recursively acquire it again.
+      offending_servers = @servers.select do |server|
+        server.description.data_bearing? && server.logical_session_timeout.nil?
+      end
+      reason = if offending_servers.empty?
+        "There are no known data bearing servers (current seeds: #{@servers.map(&:address).map(&:seed).join(', ')})"
+      else
+        "The following servers have null logical session timeout: #{offending_servers.map(&:address).map(&:seed).join(', ')}"
+      end
+      msg = "The deployment that the driver is connected to does not support sessions: #{reason}"
+      raise Error::SessionsNotSupported, msg
+    end
   end
 end