mongo 2.16.0.alpha1 → 2.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3112358aa696aa5d05305642f004ad5b32bbab28162dea03b96572ed546fc932
-  data.tar.gz: fa983d69caf1b98e44b035fd43d264df4e2c76fa1cb0761d8798e83af2173f92
+  metadata.gz: 2708181386dc2ec2ea46e5ffe3f96967c3ea1e23dfd6f0d6d6ef15fbbde3877a
+  data.tar.gz: 017f64d2a62cc0215b6234cef24c8f0be74f75ed5fa688d32155047dbd56a7e0
 SHA512:
-  metadata.gz: c38dca4384567fa492f8ecea2b357c4e72178bb70fcf1a1da9b3b932c56848f209e3c637ad5c40cb95bcb8b9e0a8017e389ea95e610cf45078108fff5bcbf49a
-  data.tar.gz: 8b2fe87f2f589c2af5ebb67a195d981cc4cf0c08c19f7090cbffe35fe270d56cd0ea6d6fa9dd304c444a8480b0793bba639787e7545bc84e18dd42fd9b7f22e3
+  metadata.gz: 2488655223e41488f275a7c8d1cd8b4c416a44a92c31cba63ab3fca21b27ec8f545b5feaa953aefb50035dbc68fe47db4f3aebb97fcb1de4e0e5fc6e3b186014
+  data.tar.gz: 671ae924600e906df4a2c209b7c491be445ef5c7c7030f6869fa991c53bd49a7cb728a718c8667b5c948022fb2912d45af437c1cf5b82f8b7ec0f0c849916045

data/lib/mongo/collection/view/builder/map_reduce.rb

@@ -115,11 +115,14 @@ module Mongo
             end
             command.update(view_options)
             command.update(Utils.slice_hash(options, :collation))
+
             # Read preference isn't simply passed in the command payload
-            # (it may need to be converted to wire protocol flags)
-            # so remove it here and hopefully it's handled elsewhere.
-            # If not, RUBY-2706.
-            command.delete(:read)
+            # (it may need to be converted to wire protocol flags).
+            # Ideally it should be removed here, however due to Mongoid 7
+            # using this method and requiring :read to be returned from it,
+            # we cannot do this just yet - see RUBY-2932.
+            #command.delete(:read)
+
             command.merge!(Options::Mapper.transform_documents(options, MAPPINGS))
             command
           end

data/lib/mongo/collection/view/map_reduce.rb

@@ -248,7 +248,20 @@ module Mongo
         end
 
         def initial_query_op(session)
-          Operation::MapReduce.new(map_reduce_spec(session))
+          spec = map_reduce_spec(session)
+          # Read preference isn't simply passed in the command payload
+          # (it may need to be converted to wire protocol flags).
+          # Passing it in command payload produces errors on at least
+          # 5.0 mongoses.
+          # In the future map_reduce_command should remove :read
+          # from its return value, however we cannot do this right now
+          # due to Mongoid 7 relying on :read being returned as part of
+          # the command - see RUBY-2932.
+          # Delete :read here for now because it cannot be sent to mongos this way.
+          spec = spec.dup
+          spec[:selector] = spec[:selector].dup
+          spec[:selector].delete(:read)
+          Operation::MapReduce.new(spec)
         end
 
         def valid_server?(server)

data/lib/mongo/server/push_monitor.rb

@@ -110,7 +110,7 @@ module Mongo
         if new_description.topology_version
           @topology_version = new_description.topology_version
         end
-      rescue Mongo::Error => exc
+      rescue IOError, SocketError, SystemCallError, Mongo::Error => exc
         stop_requested = @lock.synchronize { @stop_requested }
         if stop_requested
           # Ignore the exception, see RUBY-2771.
@@ -123,6 +123,9 @@ module Mongo
           log_prefix: options[:log_prefix],
           bg_error_backtrace: options[:bg_error_backtrace],
         )
+
+        # Avoid tight looping in push monitor - see RUBY-2806.
+        sleep(0.5)
       end
 
       def check

data/lib/mongo/version.rb

@@ -20,5 +20,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.16.0.alpha1'.freeze
+  VERSION = '2.16.2'.freeze
 end

data/spec/lite_spec_helper.rb

@@ -157,6 +157,13 @@ RSpec.configure do |config|
 end
 
 if SpecConfig.instance.active_support?
+  require "active_support/version"
+  if ActiveSupport.version >= Gem::Version.new(7)
+    # ActiveSupport wants us to require ALL of it all of the time.
+    # See: https://github.com/rails/rails/issues/43851,
+    # https://github.com/rails/rails/issues/43889, etc.
+    require 'active_support'
+  end
   require "active_support/time"
   require 'mongo/active_support'
 end

data/spec/mongo/collection/view/map_reduce_spec.rb

@@ -865,4 +865,20 @@ describe Mongo::Collection::View::MapReduce do
       end
     end
   end
+
+  describe '#map_reduce_spec' do
+    context 'when read preference is given' do
+      let(:view_options) do
+        { read: {mode: :secondary} }
+      end
+
+      context 'selector' do
+        # For compatibility with released versions of Mongoid, this method
+        # must return read preference under the :read key.
+        it 'contains read preference' do
+          map_reduce_spec[:selector][:read].should == {'mode' => :secondary}
+        end
+      end
+    end
+  end
 end

data/spec/mongo/server/monitor/connection_spec.rb

@@ -136,6 +136,28 @@ describe Mongo::Server::Monitor::Connection do
     end
   end
 
+  describe '#connect!' do
+
+    let(:options) do
+      SpecConfig.instance.test_options.merge(
+        app_metadata: monitor_app_metadata,
+      )
+    end
+
+    context 'when address resolution fails' do
+      let(:connection) { described_class.new(server.address, options) }
+
+      it 'propagates the exception' do
+        connection
+
+        expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
+        lambda do
+          connection.connect!
+        end.should raise_error(SocketError, 'Test exception')
+      end
+    end
+  end
+
   describe '#check_document' do
     context 'with API version' do
       let(:meta) do

data/spec/mongo/server/push_monitor_spec.rb

@@ -0,0 +1,101 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+require 'spec_helper'
+
+describe Mongo::Server::PushMonitor do
+  before(:all) do
+    ClientRegistry.instance.close_all_clients
+  end
+
+  let(:address) do
+    default_address
+  end
+
+  let(:listeners) do
+    Mongo::Event::Listeners.new
+  end
+
+  let(:monitor_options) do
+    {}
+  end
+
+  let(:monitor_app_metadata) do
+    Mongo::Server::Monitor::AppMetadata.new(
+      server_api: SpecConfig.instance.ruby_options[:server_api],
+    )
+  end
+
+  let(:cluster) do
+    double('cluster').tap do |cluster|
+      allow(cluster).to receive(:run_sdam_flow)
+      allow(cluster).to receive(:heartbeat_interval).and_return(1000)
+    end
+  end
+
+  let(:server) do
+    Mongo::Server.new(address, cluster, Mongo::Monitoring.new, listeners,
+      monitoring_io: false)
+  end
+
+  let(:monitor) do
+    register_background_thread_object(
+      Mongo::Server::Monitor.new(server, listeners, Mongo::Monitoring.new,
+        SpecConfig.instance.test_options.merge(cluster: cluster).merge(monitor_options).update(
+          app_metadata: monitor_app_metadata,
+          push_monitor_app_metadata: monitor_app_metadata))
+    )
+  end
+
+  let(:topology_version) do
+    Mongo::TopologyVersion.new('processId' => BSON::ObjectId.new, 'counter' => 1)
+  end
+
+  let(:check_document) do
+    {hello: 1}
+  end
+
+  let(:push_monitor) do
+    described_class.new(monitor, topology_version, monitor.monitoring,
+      **monitor.options.merge(check_document: check_document))
+  end
+
+  describe '#do_work' do
+    it 'works' do
+      lambda do
+        push_monitor.do_work
+      end.should_not raise_error
+    end
+
+    context 'network error during check' do
+      it 'does not propagate the exception' do
+        push_monitor
+
+        expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
+        lambda do
+          push_monitor.do_work
+        end.should_not raise_error
+      end
+
+      it 'throttles checks' do
+        push_monitor
+
+        start = Mongo::Utils.monotonic_time
+
+        expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
+        lambda do
+          push_monitor.do_work
+        end.should_not raise_error
+
+        expect(Socket).to receive(:getaddrinfo).and_raise(SocketError.new('Test exception'))
+        lambda do
+          push_monitor.do_work
+        end.should_not raise_error
+
+        elapsed = Mongo::Utils.monotonic_time - start
+        elapsed.should > 0.5
+      end
+    end
+  end
+
+end

data/spec/runners/auth.rb

@@ -48,7 +48,7 @@ module Mongo
       attr_reader :tests
 
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
       end
 

data/spec/runners/change_streams/spec.rb

@@ -32,7 +32,7 @@ module Mongo
       #
       # @since 2.6.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @spec_tests = @spec['tests']
         @collection_name = @spec['collection_name']

data/spec/runners/cmap.rb

@@ -40,7 +40,7 @@ module Mongo
       #
       # @param [ String ] test_path The path to the file.
       def initialize(test_path)
-        @test = YAML.load(File.read(test_path))
+        @test = ::Utils.load_spec_yaml_file(test_path)
 
         @description = @test['description']
         @pool_options = ::Utils.snakeize_hash(process_options(@test['poolOptions']))

data/spec/runners/command_monitoring.rb

@@ -204,7 +204,7 @@ module Mongo
       #
       # @since 2.1.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @data = @spec['data']
         @tests = @spec['tests']
       end

data/spec/runners/connection_string.rb

@@ -100,7 +100,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
       end
 

data/spec/runners/crud/spec.rb

@@ -12,9 +12,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(test_path)
-        contents = File.read(test_path)
-
-        @spec = YAML.load(contents)
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @data = BSON::ExtJSON.parse_obj(@spec['data'])
         @tests = @spec['tests']

data/spec/runners/gridfs.rb

@@ -100,7 +100,7 @@ module Mongo
       #
       # @since 2.1.0
       def initialize(test_path)
-        @spec = YAML.load(File.read(test_path))
+        @spec = ::Utils.load_spec_yaml_file(test_path)
         @description = File.basename(test_path)
         @data = @spec['data']
       end

data/spec/runners/read_write_concern_document.rb

@@ -13,7 +13,7 @@ module ReadWriteConcernDocument
     #
     # @since 2.0.0
     def initialize(test_path)
-      @spec = YAML.load(File.read(test_path))
+      @spec = ::Utils.load_spec_yaml_file(test_path)
       @description = File.basename(test_path)
     end
 

data/spec/runners/sdam.rb

@@ -77,7 +77,7 @@ module Mongo
       #
       # @since 2.0.0
       def initialize(test_path)
-        @test = YAML.load(File.read(test_path))
+        @test = ::Utils.load_spec_yaml_file(test_path)
         @description = @test['description']
         @uri_string = @test['uri']
         @uri = URI.new(uri_string)

data/spec/runners/server_selection.rb

@@ -64,7 +64,7 @@ module Mongo
         #
         # @since 2.0.0
         def initialize(test_path)
-          @test = YAML.load(File.read(test_path))
+          @test = ::Utils.load_spec_yaml_file(test_path)
           @description = "#{@test['topology_description']['type']}: #{File.basename(test_path)}"
           @heartbeat_frequency = @test['heartbeatFrequencyMS'] / 1000 if @test['heartbeatFrequencyMS']
           @read_preference = @test['read_preference']

data/spec/runners/server_selection_rtt.rb

@@ -28,7 +28,7 @@ module Mongo
         #
         # @since 2.0.0
         def initialize(test_path)
-          @test = YAML.load(File.read(test_path))
+          @test = ::Utils.load_spec_yaml_file(test_path)
           @description = "#{File.basename(test_path)}: avg_rtt_ms: #{@test['avg_rtt_ms']}, new_rtt_ms: #{@test['new_rtt_ms']}," +
                            " new_avg_rtt: #{@test['new_avg_rtt']}"
           @average_rtt = @test['avg_rtt_ms'] == 'NULL' ? nil : @test['avg_rtt_ms'].to_f / 1000

data/spec/runners/unified/support_operations.rb

@@ -208,12 +208,20 @@ module Unified
             else
               raise
             end
+          rescue Interrupt
+            raise
           rescue => e
-            if store_errors
+            if store_failures
+              STDERR.puts "Error: #{e.class}: #{e} (reporting as failure)"
+              entities.get(:failure_list, store_failures) << {
+                error: "#{e.class}: #{e}",
+                time: Time.now.to_f,
+              }
+            elsif store_errors
               STDERR.puts "Error: #{e.class}: #{e}"
               entities.get(:error_list, store_errors) << {
                 error: "#{e.class}: #{e}",
-                observedAt: Time.now.to_f,
+                time: Time.now.to_f,
               }
             else
               raise

data/spec/runners/unified/test_group.rb

@@ -6,7 +6,7 @@ module Unified
   class TestGroup
     def initialize(path, **opts)
       if String === path
-        data = YAML.load(File.read(path))
+        data = ::Utils.load_spec_yaml_file(path)
       else
         data = path
       end

data/spec/shared/lib/mrss/cluster_config.rb

@@ -209,7 +209,12 @@ module Mrss
       @server_version = build_info['version']
       @enterprise = build_info['modules'] && build_info['modules'].include?('enterprise')
 
-      @server_parameters = client.use(:admin).command(getParameter: '*').first
+      @server_parameters = begin
+        client.use(:admin).command(getParameter: '*').first
+      rescue => e
+        STDERR.puts("WARNING: Failed to obtain server parameters: #{e.class}: #{e.message}")
+        {}
+      end
 
       if !sharded_ish? && short_server_version >= '3.4'
         rv = @server_parameters['featureCompatibilityVersion']

data/spec/shared/share/Dockerfile.erb

@@ -55,7 +55,7 @@ FROM <%= base_image %>
   # Ruby runtime dependencies: libyaml-0-2
   # Compiling ruby libraries: gcc make
   # Compiling pyhton packages: python2.7-dev
-  # JRuby: openjdk-8-jre-headless
+  # JRuby: openjdk-8-jdk-headless
   # Server dependencies: libsnmp30 libcurl3/libcurl4
   # Determining OS we are running on: lsb-release
   # Load balancer testing: haproxy
@@ -104,11 +104,11 @@ FROM <%= base_image %>
   <% end %>
 
   <% if distro =~ /debian10/ %>
-    <% packages << 'openjdk-11-jre-headless' %>
+    <% packages << 'openjdk-11-jdk-headless' %>
   <% elsif distro =~ /ubuntu1404/ %>
     # Ubuntu 14.04 only has openjdk 7, this is too old to be useful
   <% else %>
-    <% packages << 'openjdk-8-jre-headless' %>
+    <% packages << 'openjdk-8-jdk-headless' %>
   <% end %>
 
   # ubuntu1404, ubuntu1604: libcurl3

data/spec/spec_tests/seed_list_discovery_spec.rb

@@ -15,7 +15,7 @@ describe 'DNS Seedlist Discovery' do
 
   SEED_LIST_DISCOVERY_TESTS.each do |test_path|
 
-    spec = YAML.load(File.read(test_path))
+    spec = ::Utils.load_spec_yaml_file(test_path)
 
     test = Mongo::ConnectionString::Test.new(spec)
 

data/spec/support/spec_config.rb

@@ -13,7 +13,7 @@ class SpecConfig
     @uri_options = {}
     @ruby_options = {}
     if ENV['MONGODB_URI']
-      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+      @mongodb_uri = Mongo::URI.get(ENV['MONGODB_URI'])
       @uri_options = Mongo::Options::Mapper.transform_keys_to_symbols(@mongodb_uri.uri_options)
       if ENV['TOPOLOGY'] == 'load-balanced'
         @addresses = @mongodb_uri.servers

data/spec/support/utils.rb

@@ -595,4 +595,35 @@ module Utils
       end
     end
   end
+
+  module_function def load_spec_yaml_file(path)
+    permitted_classes = [
+                          BigDecimal,
+                          Date,
+                          Time,
+                          Range,
+                          Regexp,
+                          Symbol,
+                          BSON::Binary,
+                          BSON::Code,
+                          BSON::CodeWithScope,
+                          BSON::DbPointer,
+                          BSON::Decimal128,
+                          BSON::Int32,
+                          BSON::Int64,
+                          BSON::MaxKey,
+                          BSON::MinKey,
+                          BSON::ObjectId,
+                          BSON::Regexp::Raw,
+                          BSON::Symbol::Raw,
+                          BSON::Timestamp,
+                          BSON::Undefined,
+                        ]
+    if RUBY_VERSION < '2.6'
+      YAML.safe_load(File.read(path), permitted_classes, [], true)
+    else
+      # Here we have Ruby 2.6+ that supports the new syntax of `safe_load``.
+      YAML.safe_load(File.read(path), permitted_classes: permitted_classes, aliases: true)
+    end
+  end
 end

data.tar.gz.sig

@@ -1,2 +1 @@
-��������.��ݎ�Z�}��9�/��"�@���>u��)�D;:#a	i;��g�[�W4��
-_�"�XA�G �w����>�{*�U��)��-y�?��Y�P2��^r�4T�6���*|C�d_��S�J�}�@�s��=��c��+n�L�k�>����(��vPk�cXT�j!9��fx��(\���6IGe�6�)�g<�T�egf�9�e
+��l�i'#���X�aBY�-�TRM�ZA�k�xe���#֑��Kt2-����z�}er;����_3XM�4�k��D�����6��@��9�'����d�����)I>�Ua9��$�m�^e�7���P�P���,��w�0��2E1�m�o�*��d��wF_��o"Y������!i��#�sJ���_A��(�l��l��D�a*D[�Y+��B���T����t���