mongo 2.9.2 → 2.10.0.rc0

data/spec/spec_tests/data/transactions_api/commit.yml

@@ -2,6 +2,9 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    -
+        minServerVersion: "4.1.8"
+        topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -11,6 +14,7 @@ data: []
 tests:
   -
     description: withTransaction commits after callback returns
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction
@@ -91,6 +95,7 @@ tests:
     # withTransaction only examines the session's state, it should commit that
     # second transaction after the callback returns.
     description: withTransaction commits after callback returns (second transaction)
+    useMultipleMongoses: true
     operations:
       -
         name: withTransaction

data/spec/spec_tests/data/transactions_api/transaction-options.yml

@@ -2,6 +2,10 @@ runOn:
     -
         minServerVersion: "4.0"
         topology: ["replicaset"]
+    # Disabled due to https://jira.mongodb.org/browse/SERVER-41532
+    #-
+    #    minServerVersion: "4.1.8"
+    #    topology: ["sharded"]
 
 database_name: &database_name "withTransaction-tests"
 collection_name: &collection_name "test"
@@ -11,6 +15,7 @@ data: []
 tests:
   -
     description: withTransaction and no transaction options set
+    useMultipleMongoses: true
     operations: &operations
       -
         name: withTransaction
@@ -62,6 +67,7 @@ tests:
           - { _id: 1 }
   -
     description: withTransaction inherits transaction options from client
+    useMultipleMongoses: true
     clientOptions:
       readConcernLevel: local
       w: 1
@@ -99,6 +105,7 @@ tests:
     outcome: *outcome
   -
     description: withTransaction inherits transaction options from defaultTransactionOptions
+    useMultipleMongoses: true
     sessionOptions:
       session0:
         defaultTransactionOptions:
@@ -138,6 +145,7 @@ tests:
     outcome: *outcome
   -
     description: withTransaction explicit transaction options
+    useMultipleMongoses: true
     operations: &operations_explicit_transactionOptions
       -
         name: withTransaction
@@ -189,6 +197,7 @@ tests:
     outcome: *outcome
   -
     description: withTransaction explicit transaction options override defaultTransactionOptions
+    useMultipleMongoses: true
     sessionOptions:
       session0:
         defaultTransactionOptions:
@@ -228,6 +237,7 @@ tests:
     outcome: *outcome
   -
     description: withTransaction explicit transaction options override client options
+    useMultipleMongoses: true
     clientOptions:
       readConcernLevel: majority
       w: majority

data/spec/spec_tests/retryable_reads_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
-describe do
-  define_crud_spec_tests('Retryable reads spec tests', RETRYABLE_READS_TESTS.sort) do |spec, req, test|
+describe 'Retryable reads spec tests' do
+  require_wired_tiger
+  require_no_multi_shard
+
+  define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
     let(:client) do
       root_authorized_client.with({max_read_retries: 0}.update(test.client_options)).tap do |client|
         client.subscribe(Mongo::Monitoring::COMMAND, event_subscriber)

data/spec/spec_tests/retryable_writes_spec.rb

@@ -1,7 +1,10 @@
 require 'spec_helper'
 
-describe do
-  define_crud_spec_tests('Retryable writes spec tests', RETRYABLE_WRITES_TESTS.sort) do |spec, req, test|
+describe 'Retryable writes spec tests' do
+  require_wired_tiger
+  require_no_multi_shard
+
+  define_crud_spec_tests(RETRYABLE_WRITES_TESTS) do |spec, req, test|
     let(:client) do
       authorized_client_with_retry_writes
     end

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -18,8 +18,8 @@ describe 'SDAM Monitoring' do
           client.subscribe(Mongo::Monitoring::TOPOLOGY_OPENING, @subscriber)
           client.subscribe(Mongo::Monitoring::TOPOLOGY_CHANGED, @subscriber)
         end
-        @client = Mongo::Client.new(spec.uri_string,
-          sdam_proc: sdam_proc, monitoring_io: false,
+        @client = new_local_client_nmio(spec.uri_string,
+          sdam_proc: sdam_proc,
           heartbeat_frequency: 100, connect_timeout: 0.1)
         # We do not want to create servers when an event referencing them
         # is processed, because this may result in server duplication
@@ -33,7 +33,7 @@ describe 'SDAM Monitoring' do
       end
 
       after(:all) do
-        @client.close
+        @client.close(true)
       end
 
       spec.phases.each_with_index do |phase, phase_index|

data/spec/spec_tests/sdam_spec.rb

@@ -36,7 +36,7 @@ describe 'Server Discovery and Monitoring' do
       end
 
       after(:all) do
-        @client && @client.close
+        @client && @client.close(true)
       end
 
       spec.phases.each_with_index do |phase, index|
@@ -160,7 +160,7 @@ describe 'Server Discovery and Monitoring' do
 
             it 'raises an UnsupportedFeatures error' do
               expect {
-                p = Mongo::ServerSelector.get(mode: :primary).select_server(@client.cluster)
+                p = Mongo::ServerSelector.primary.select_server(@client.cluster)
                 s = Mongo::ServerSelector.get(mode: :secondary).select_server(@client.cluster)
                 raise "UnsupportedFeatures not raised but we got #{p.inspect} as primary and #{s.inspect} as secondary"
               }.to raise_exception(Mongo::Error::UnsupportedFeatures)

data/spec/spec_tests/transactions_api_spec.rb

@@ -1,71 +1,5 @@
 require 'spec_helper'
 
 describe 'Transactions API' do
-
-  TRANSACTIONS_API_TESTS.sort.each do |file|
-
-    spec = Mongo::Transactions::Spec.new(file)
-
-    context(spec.description) do
-      define_spec_tests_with_requirements(spec) do |req|
-        spec.tests.each do |test_factory|
-          test_instance = test_factory.call
-
-          context(test_instance.description) do
-
-            let(:test) { test_factory.call }
-
-            if test_instance.skip_reason
-              before do
-                skip test_instance.skip_reason
-              end
-            end
-
-            before(:each) do
-              if req.satisfied?
-                test.setup_test
-              end
-            end
-
-            after(:each) do
-              if req.satisfied?
-                test.teardown_test
-              end
-            end
-
-            let(:results) do
-              test.run
-            end
-
-            let(:verifier) { Mongo::CRUD::Verifier.new(test) }
-
-            it 'returns the correct result' do
-              verifier.verify_operation_result(test_instance.expected_results, results[:results])
-            end
-
-            it 'has the correct data in the collection', if: test_instance.outcome.collection_data? do
-              results
-              verifier.verify_collection_data(
-                test_instance.outcome.collection_data,
-                results[:contents])
-            end
-
-            if test_instance.expectations
-              it 'has the correct number of command_started events' do
-                verifier.verify_command_started_event_count(
-                  test_instance.expectations, results[:events])
-              end
-
-              test_instance.expectations.each_with_index do |expectation, i|
-                it "has the correct command_started event #{i}" do
-                  verifier.verify_command_started_event(
-                    test_instance.expectations, results[:events], i)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
+  define_transactions_spec_tests(TRANSACTIONS_API_TESTS)
 end

data/spec/spec_tests/transactions_spec.rb

@@ -1,71 +1,7 @@
 require 'spec_helper'
 
 describe 'Transactions' do
+  clean_slate_on_evergreen
 
-  TRANSACTIONS_TESTS.sort.each do |file|
-
-    spec = Mongo::Transactions::Spec.new(file)
-
-    context(spec.description) do
-      define_spec_tests_with_requirements(spec) do |req|
-        spec.tests.each do |test_factory|
-          test_instance = test_factory.call
-
-          context(test_instance.description) do
-
-            let(:test) { test_factory.call }
-
-            if test_instance.skip_reason
-              before do
-                skip test_instance.skip_reason
-              end
-            end
-
-            before(:each) do
-              if req.satisfied?
-                test.setup_test
-              end
-            end
-
-            after(:each) do
-              if req.satisfied?
-                test.teardown_test
-              end
-            end
-
-            let(:results) do
-              test.run
-            end
-
-            let(:verifier) { Mongo::CRUD::Verifier.new(test) }
-
-            it 'returns the correct result' do
-              verifier.verify_operation_result(test_instance.expected_results, results[:results])
-            end
-
-            it 'has the correct data in the collection', if: test_instance.outcome && test_instance.outcome.collection_data? do
-              results
-              verifier.verify_collection_data(
-                test_instance.outcome.collection_data,
-                results[:contents])
-            end
-
-            if test_instance.expectations
-              it 'has the correct number of command_started events' do
-                verifier.verify_command_started_event_count(
-                  test_instance.expectations, results[:events])
-              end
-
-              test_instance.expectations.each_with_index do |expectation, i|
-                it "has the correct command_started event #{i}" do
-                  verifier.verify_command_started_event(
-                    test_instance.expectations, results[:events], i)
-                end
-              end
-            end
-          end
-        end
-      end
-    end
-  end
+  define_transactions_spec_tests(TRANSACTIONS_TESTS)
 end

data/spec/support/authorization.rb

@@ -111,6 +111,10 @@ module Authorization
     # @since 2.0.0
     context.let(:root_authorized_client) { ClientRegistry.instance.global_client('root_authorized') }
 
+    context.let(:root_authorized_admin_client) do
+      ClientRegistry.instance.global_client('root_authorized').use(:admin)
+    end
+
     # Gets the default test collection from the authorized client.
     #
     # @since 2.0.0

data/spec/support/change_streams.rb

@@ -77,6 +77,11 @@ module Mongo
         # @since 2.0.0
         attr_reader :description
 
+        # Optional list of command-started events in Extended JSON format
+        #
+        # @return [ Array<Hash> ] The list of command-started events
+        attr_reader :expectations
+
         def initialize(test, coll1, coll2, db1, db2)
           @description = test['description']
           @min_server_version = test['minServerVersion']
@@ -132,22 +137,36 @@ module Mongo
             }
           end
 
+          # JRuby must iterate the same object, not switch from
+          # enum to change stream
+          enum = change_stream.to_enum
+
           @operations.each do |op|
             op.execute(@db1, @db2)
           end
 
-          changes = [].tap do |changes|
-                           next unless @result['success']
+          changes = []
 
-                           unless @result['success'].empty?
-                             change_stream.take_while do |change|
-                               changes << change
-                               changes.length < @result['success'].length
-                             end
-                           end
+          # attempt first next call (catch NonResumableChangeStreamError errors)
+          begin
+            change = enum.next
+            changes << change
+          rescue Mongo::Error::OperationFailure => e
+            return {
+              result: { 'error' => { 'code' => e.code, 'errorLabels' => e.labels} },
+              events: events
+            }
+          end
+
+          # continue until changeStream has received as many changes as there
+          # are in result.success
+          if @result['success'] && changes.length < @result['success'].length
+            while changes.length < @result['success'].length
+              changes << enum.next
+            end
+          end
 
-                           change_stream.close
-                         end
+          change_stream.close
 
           {
             result: { 'success' => changes },
@@ -204,6 +223,7 @@ module Mongo
 
         def match_array?(expected, actual)
           return false unless actual.is_a?(Array)
+          return false unless expected.length == actual.length
 
           expected.each_with_index.all? do |e, i|
             actual[i] && match?(e, actual[i])

data/spec/support/change_streams/operation.rb

@@ -50,6 +50,29 @@ module Mongo
         coll.insert_one(document)
       end
 
+      def update_one(coll)
+        coll.update_one(filter, arguments['update'])
+      end
+
+      def replace_one(coll)
+        coll.replace_one(filter, arguments['replacement'])
+      end
+
+      def delete_one(coll)
+        coll.delete_one(filter)
+      end
+
+      def drop(coll)
+        coll.drop
+      end
+
+      def rename(coll)
+        coll.client.use(:admin).command({
+          renameCollection: "#{coll.database.name}.#{coll.name}", 
+          to: "#{coll.database.name}.#{arguments['to']}"
+        })
+      end
+
       def arguments
         @spec['arguments']
       end
@@ -57,6 +80,10 @@ module Mongo
       def document
         arguments['document']
       end
+
+      def filter
+        arguments['filter']
+      end
     end
   end
 end

data/spec/support/client_registry.rb

@@ -45,24 +45,38 @@ class ClientRegistry
     # clients global to the test suite, should not be closed in an after hooks
     # but their monitoring may need to be suspended/resumed
     @global_clients = {}
+
+    # JRuby appears to somehow manage to access client registry concurrently
+    @lock = Mutex.new
   end
 
-  def global_client(name)
-    if client = @global_clients[name]
+  class << self
+    def client_perished?(client)
       if !client.cluster.connected?
-        reconnect = true
+        true
       else
-        reconnect = false
+        perished = false
         client.cluster.servers_list.each do |server|
           thread = server.monitor.instance_variable_get('@thread')
           if thread.nil? || !thread.alive?
-            reconnect = true
+            perished = true
           end
         end
+        perished
       end
-      if reconnect
+    end
+    private :client_perished?
+
+    def reconnect_client_if_perished(client)
+      if client_perished?(client)
         client.reconnect
       end
+    end
+  end
+
+  def global_client(name)
+    if client = @global_clients[name]
+      self.class.reconnect_client_if_perished(client)
       return client
     end
 
@@ -122,6 +136,15 @@ class ClientRegistry
       ).tap do |client|
         client.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber)
       end
+    # Provides an authorized mongo client that does not retry writes
+    # using either modern or legacy mechanisms.
+    when 'authorized_without_any_retry_writes'
+      global_client('authorized').with(
+        retry_writes: false, max_write_retries: 0,
+        server_selection_timeout: 4.99,
+      ).tap do |client|
+        client.subscribe(Mongo::Monitoring::COMMAND, EventSubscriber)
+      end
     # Provides an authorized mongo client that does not retry reads or writes
     # at all.
     when 'authorized_without_any_retries'
@@ -152,19 +175,6 @@ class ClientRegistry
           monitoring: false
         ),
       )
-    # Get an authorized client on the admin database logged in as the admin
-    # root user.
-    when 'root_authorized_admin'
-      Mongo::Client.new(
-        SpecConfig.instance.addresses,
-        SpecConfig.instance.test_options.merge(
-          user: SpecConfig.instance.root_user.name,
-          password: SpecConfig.instance.root_user.password,
-          database: 'admin',
-          auth_source: SpecConfig.instance.auth_source || Mongo::Database::ADMIN,
-          monitoring: false
-        ),
-      )
     # A client that has an event subscriber for commands.
     when 'subscribed'
       Mongo::Client.new(
@@ -184,24 +194,33 @@ class ClientRegistry
 
   def new_local_client(*args)
     Mongo::Client.new(*args).tap do |client|
-      @local_clients << client
+      @lock.synchronize do
+        @local_clients << client
+      end
     end
   end
 
   def register_local_client(client)
-    @local_clients << client
+    @lock.synchronize do
+      @local_clients << client
+    end
     client
   end
 
   def close_local_clients
-    @local_clients.map(&:close)
-    @local_clients = []
+    @lock.synchronize do
+      @local_clients.map(&:close)
+      @local_clients = []
+    end
   end
 
   def close_all_clients
+    ClusterTools.instance.close_clients
     close_local_clients
-    @global_clients.each do |name, client|
-      client.close(true)
+    @lock.synchronize do
+      @global_clients.each do |name, client|
+        client.close(true)
+      end
     end
   end
 end