mongo 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a1e6b0cb6b8548601a5ad4c4758361f9815d65750b52fef6b2393eb09ab5ae4
-  data.tar.gz: '084a8d5a64bba3ffaab853919918f9cb214754edbaec4ac22eeaee5e9954f39b'
+  metadata.gz: 18e71f41caf0b6b8c618c8ea7cedb903ca10248949993c6c25ebf61d6acf3bba
+  data.tar.gz: bd587a35aadbaf790b61c83867f276bd13858c6469fb8ef26bf3907e58a5703a
 SHA512:
-  metadata.gz: 19fc6811951a53cfef86d647849337fb56014e97d2cf9aec0ea0de58f3525632a96e04c1f5a6ecd4f6de8f7a853faded939e59f716d9fa4a6c9ac40a7e742ce9
-  data.tar.gz: '08ff4b626997aa23fb9db94893818e2326cc2c13032ea4dabf512628b436597f13a2c69a2693d57fd58d60208c384660b4c811ca98b8aeb1a47994b212a0dbd5'
+  metadata.gz: c923c55b783fb6d0a37d90116684afe65c038d1d7c06dfa1ace59a825eeee441ad7384f42ab45cb47bc7f2abedc16faef6f5f8adef68751631dcc57ddbca8be1
+  data.tar.gz: bff45797b2533f2d842787c9c1d63eef76deab4471244af4d759237ab122b70d3c785d2ad064bf0b79e3d045c86efa5f6f7f47e4b8cdec5607b95ffd323400d3

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-��B��H��\v0��m�1h]CQ-Ҥق�H��_	�u����l��*ί���B�|���Z9��{ҡ��<Y��
-�h0MΓ��H��o��"w�;{�c�sȄ��/��D!�)'�#�Pcf�r���R`����\'ז�S�SZD�
+*܉o]���GO�=��S��rhc�ug�0D����}D����җoC&AH�N��9)s����(��p��qo�dh^_���pZ�L)J(m�lܫ��p駴�x���#Fƻkf!��3f�j�0"ٖ|繣��Zy����?j��j�����Бd�1(2�������[D<��ޒ�9���l���m"R
+�"�G�~����:��
+q_���=��y=�|�Т[��
�-�����ވ���`��+Vf!

data/lib/mongo/bulk_write.rb

@@ -23,7 +23,7 @@ require 'mongo/bulk_write/result_combiner'
 module Mongo
   class BulkWrite
     extend Forwardable
-    include Operation::Unpinnable
+    include Operation::ResponseHandling
 
     # @return [ Mongo::Collection ] collection The collection.
     attr_reader :collection

data/lib/mongo/error.rb

@@ -12,11 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'mongo/error/notable'
+
 module Mongo
   # Base error class for all Mongo related errors.
   #
   # @since 2.0.0
   class Error < StandardError
+    include Notable
 
     # The error code field.
     #
@@ -141,6 +144,7 @@ module Mongo
   end
 end
 
+require 'mongo/error/auth_error'
 require 'mongo/error/sdam_error_detection'
 require 'mongo/error/parser'
 require 'mongo/error/write_retryable'

data/lib/mongo/error/auth_error.rb

@@ -0,0 +1,29 @@
+# Copyright (C) 2018-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 authentication fails.
+    #
+    # Note: This class is derived from RuntimeError for
+    # backwards compatibility reasons. It is subject to
+    # change in future major versions of the driver.
+    #
+    # @since 2.10.1
+    class AuthError < RuntimeError
+      include Notable
+    end
+  end
+end

data/lib/mongo/error/bulk_write_error.rb

@@ -50,7 +50,7 @@ module Mongo
         else
           ''
         end
-        self.class.name + messages
+        "#{self.class}: #{messages}" + notes_tail
       end
     end
   end

data/lib/mongo/error/notable.rb

@@ -0,0 +1,80 @@
+# 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 < StandardError
+
+    # A module encapsulating note tracking functionality, since currently
+    # the driver does not have a single exception hierarchy root.
+    #
+    # @since 2.10.1
+    # @api private
+    module Notable
+
+      # Returns an array of strings with additional information about the
+      # exception.
+      #
+      # @return [ Array<String> ] Additional information strings.
+      #
+      # @since 2.10.1
+      # @api public
+      def notes
+        if @notes
+          @notes.dup
+        else
+          []
+        end
+      end
+
+      # @api private
+      def add_note(note)
+        unless @notes
+          @notes = []
+        end
+        @notes << note
+      end
+
+      # @api public
+      def message
+        super + notes_tail
+      end
+
+      # @api public
+      def to_s
+        super + notes_tail
+      end
+
+      # @api public
+      def inspect
+        msg = super
+        if msg.end_with?('>')
+          msg[0...msg.length-1] + notes_tail + '>'
+        else
+          msg + notes_tail
+        end
+      end
+
+      private
+
+      # @api private
+      def notes_tail
+        msg = ''
+        unless notes.empty?
+          msg += " (#{notes.join(', ')})"
+        end
+        msg
+      end
+    end
+  end
+end

data/lib/mongo/operation.rb

@@ -1,5 +1,6 @@
 require 'mongo/operation/result'
 
+require 'mongo/operation/shared/response_handling'
 require 'mongo/operation/shared/executable'
 require 'mongo/operation/shared/executable_no_validate'
 require 'mongo/operation/shared/executable_transaction_label'
@@ -13,7 +14,6 @@ require 'mongo/operation/shared/sessions_supported'
 require 'mongo/operation/shared/causal_consistency_supported'
 require 'mongo/operation/shared/write'
 require 'mongo/operation/shared/idable'
-require 'mongo/operation/shared/unpinnable'
 require 'mongo/operation/shared/specifiable'
 require 'mongo/operation/shared/object_id_generator'
 require 'mongo/operation/shared/op_msg_or_command'

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

@@ -24,28 +24,18 @@ module Mongo
       class Command
         include Specifiable
         include Executable
+        include ExecutableNoValidate
         include Idable
         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::Insert::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server), @ids)
-          process_result(result, server)
-        end
-
         private
 
+        def get_result(server)
+          Result.new(dispatch_message(server), @ids)
+        end
+
         def selector(server)
           { insert: coll_name,
             documents: send(IDENTIFIER),

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

@@ -28,24 +28,12 @@ module Mongo
         include Executable
         include Idable
 
-        # Execute the operation.
-        #
-        # @example
-        #   operation.execute(server)
-        #
-        # @param [ Mongo::Server ] server The server to send the operation to.
-        #
-        # @return [ Mongo::Operation::Insert::Result ] The operation result.
-        #
-        # @since 2.5.2
-        def execute(server)
-          result = Result.new(dispatch_message(server), @ids)
-          process_result(result, server)
-          result.validate!
-        end
-
         private
 
+        def get_result(server)
+          Result.new(dispatch_message(server), @ids)
+        end
+
         def selector
           send(IDENTIFIER).first
         end

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

@@ -20,11 +20,15 @@ module Mongo
     # @since 2.5.2
     module Executable
 
+      include ResponseHandling
+
       def do_execute(server)
         unpin_maybe(session) do
           add_error_labels do
-            get_result(server).tap do |result|
-              process_result(result, server)
+            add_server_diagnostics(server) do
+              get_result(server).tap do |result|
+                process_result(result, server)
+              end
             end
           end
         end
@@ -32,7 +36,7 @@ module Mongo
 
       def execute(server)
         do_execute(server).tap do |result|
-          validate_result(result)
+          validate_result(result, server)
         end
       end
 

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

@@ -0,0 +1,94 @@
+# 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
+  module Operation
+
+    # Shared behavior of response handling for operations.
+    #
+    # @api private
+    module ResponseHandling
+
+      private
+
+      def validate_result(result, server)
+        unpin_maybe(session) do
+          add_error_labels do
+            add_server_diagnostics(server) do
+              result.validate!
+            end
+          end
+        end
+      end
+
+      # Adds error labels to exceptions raised in the yielded to block,
+      # which should perform MongoDB operations and raise Mongo::Errors on
+      # failure. This method handles network errors (Error::SocketError)
+      # and server-side errors (Error::OperationFailure); it does not
+      # handle server selection errors (Error::NoServerAvailable), for which
+      # labels are added in the server selection code.
+      def add_error_labels
+        begin
+          yield
+        rescue Mongo::Error::SocketError => e
+          if session && session.in_transaction? && !session.committing_transaction?
+            e.add_label('TransientTransactionError')
+          end
+          if session && session.committing_transaction?
+            e.add_label('UnknownTransactionCommitResult')
+          end
+          raise e
+        rescue Mongo::Error::OperationFailure => e
+          if session && session.committing_transaction?
+            if e.write_retryable? || e.wtimeout? || (e.write_concern_error? &&
+                !Session::UNLABELED_WRITE_CONCERN_CODES.include?(e.write_concern_error_code)
+            ) || e.max_time_ms_expired?
+              e.add_label('UnknownTransactionCommitResult')
+            end
+          end
+          raise e
+        end
+      end
+
+      # Unpins the session if the session is pinned and the yielded to block
+      # raises errors that are required to unpin the session.
+      #
+      # @note This method takes the session as an argument because this module
+      #   is included in BulkWrite which does not store the session in the
+      #   receiver (despite Specifiable doing so).
+      #
+      # @param [ Session | nil ] Session to consider.
+      def unpin_maybe(session)
+        yield
+      rescue Mongo::Error => e
+        if session
+          session.unpin_maybe(e)
+        end
+        raise
+      end
+
+      # Yields to the block and, if the block raises an exception, adds a note
+      # to the exception with the address of the specified server.
+      #
+      # This method is intended to add server address information to exceptions
+      # raised during execution of operations on servers.
+      def add_server_diagnostics(server)
+        yield
+      rescue Mongo::Error, Mongo::Error::AuthError => e
+        e.add_note("on #{server.address.seed}")
+        raise e
+      end
+    end
+  end
+end

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

@@ -20,7 +20,6 @@ module Mongo
     #
     # @since 2.0.0
     module Specifiable
-      include Unpinnable
 
       # The field for database name.
       #
@@ -565,45 +564,6 @@ module Mongo
       def acknowledged_write?
         write_concern.nil? || write_concern.acknowledged?
       end
-
-      private
-
-      def validate_result(result)
-        unpin_maybe(session) do
-          add_error_labels do
-            result.validate!
-          end
-        end
-      end
-
-      # Adds error labels to exceptions raised in the yielded to block,
-      # which should perform MongoDB operations and raise Mongo::Errors on
-      # failure. This method handles network errors (Error::SocketError)
-      # and server-side errors (Error::OperationFailure); it does not
-      # handle server selection errors (Error::NoServerAvailable), for which
-      # labels are added in the server selection code.
-      def add_error_labels
-        begin
-          yield
-        rescue Mongo::Error::SocketError => e
-          if session && session.in_transaction? && !session.committing_transaction?
-            e.add_label('TransientTransactionError')
-          end
-          if session && session.committing_transaction?
-            e.add_label('UnknownTransactionCommitResult')
-          end
-          raise e
-        rescue Mongo::Error::OperationFailure => e
-          if session && session.committing_transaction?
-            if e.write_retryable? || e.wtimeout? || (e.write_concern_error? &&
-                !Session::UNLABELED_WRITE_CONCERN_CODES.include?(e.write_concern_error_code)
-            ) || e.max_time_ms_expired?
-              e.add_label('UnknownTransactionCommitResult')
-            end
-          end
-          raise e
-        end
-      end
     end
   end
 end

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

@@ -20,6 +20,8 @@ module Mongo
     # @since 2.5.2
     module Write
 
+      include ResponseHandling
+
       # Execute the operation.
       #
       # @example
@@ -39,7 +41,7 @@ module Mongo
           else
             self.class::Command.new(spec).execute(server)
           end
-        validate_result(result)
+        validate_result(result, server)
       end
 
       # Execute the bulk write operation.

data/lib/mongo/retryable.rb

@@ -206,19 +206,25 @@ module Mongo
         return legacy_write_with_retry(server, session, &block)
       end
 
+      txn_num = if session.in_transaction?
+        session.txn_num
+      else
+        session.next_txn_num
+      end
       begin
-        txn_num = session.in_transaction? ? session.txn_num : session.next_txn_num
         yield(server, txn_num, false)
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note("attempt 1")
         if session.in_transaction? && !ending_transaction
-          raise
+          raise e
         end
         retry_write(e, session, txn_num, &block)
       rescue Error::OperationFailure => e
+        e.add_note("attempt 1")
         if e.unsupported_retryable_write?
           raise_unsupported_error(e)
         elsif (session.in_transaction? && !ending_transaction) || !e.write_retryable?
-          raise
+          raise e
         end
 
         retry_write(e, session, txn_num, &block)
@@ -274,16 +280,17 @@ module Mongo
         server ||= select_server(cluster, ServerSelector.primary, session)
         yield server
       rescue Error::OperationFailure => e
+        e.add_note("attempt #{attempt + 1}")
         server = nil
         if attempt > client.max_write_retries
-          raise
+          raise e
         end
         if e.write_retryable? && !(session && session.in_transaction?)
           log_retry(e, message: 'Legacy write retry')
           cluster.scan!(false)
           retry
         else
-          raise
+          raise e
         end
       end
     end
@@ -296,13 +303,15 @@ module Mongo
       begin
         yield server
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note("attempt #{attempt + 1}")
         if session.in_transaction?
-          raise
+          raise e
         end
         retry_read(e, server_selector, session, &block)
       rescue Error::OperationFailure => e
+        e.add_note("attempt #{attempt + 1}")
         if session.in_transaction? || !e.write_retryable?
-          raise
+          raise e
         end
         retry_read(e, server_selector, session, &block)
       end
@@ -315,23 +324,25 @@ module Mongo
         attempt += 1
         yield server
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note("attempt #{attempt + 1}")
         if attempt > client.max_read_retries || (session && session.in_transaction?)
-          raise
+          raise e
         end
         log_retry(e, message: 'Legacy read retry')
         server = select_server(cluster, server_selector, session)
         retry
       rescue Error::OperationFailure => e
+        e.add_note("attempt #{attempt + 1}")
         if cluster.sharded? && e.retryable? && !(session && session.in_transaction?)
           if attempt > client.max_read_retries
-            raise
+            raise e
           end
           log_retry(e, message: 'Legacy read retry')
           sleep(client.read_retry_interval)
           server = select_server(cluster, server_selector, session)
           retry
         else
-          raise
+          raise e
         end
       end
     end
@@ -354,7 +365,8 @@ module Mongo
     def retry_read(original_error, server_selector, session, &block)
       begin
         server = select_server(cluster, server_selector, session)
-      rescue
+      rescue => e
+        original_error.add_note("later retry failed: #{e.class}: #{e}")
         raise original_error
       end
 
@@ -363,11 +375,17 @@ module Mongo
       begin
         yield server, true
       rescue Error::SocketError, Error::SocketTimeoutError => e
+        e.add_note("attempt 2")
         raise e
       rescue Error::OperationFailure => e
-        raise original_error unless e.write_retryable?
+        unless e.write_retryable?
+          original_error.add_note("later retry failed: #{e.class}: #{e}")
+          raise original_error
+        end
+        e.add_note("attempt 2")
         raise e
-      rescue
+      rescue => e
+        original_error.add_note("later retry failed: #{e.class}: #{e}")
         raise original_error
       end
     end
@@ -379,15 +397,25 @@ module Mongo
       # 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 = select_server(cluster, ServerSelector.primary, session)
-      raise original_error unless (server.retry_writes? && txn_num)
+      unless server.retry_writes?
+        original_error.add_note('did not retry because server selected for retry does not supoprt retryable writes')
+        raise original_error
+      end
       log_retry(original_error, message: 'Write retry')
       yield(server, txn_num, true)
     rescue Error::SocketError, Error::SocketTimeoutError => e
+      e.add_note('attempt 2')
       raise e
     rescue Error::OperationFailure => e
-      raise original_error unless e.write_retryable?
-      raise e
-    rescue
+      if e.write_retryable?
+        e.add_note('attempt 2')
+        raise e
+      else
+        original_error.add_note("later retry failed: #{e.class}: #{e}")
+        raise original_error
+      end
+    rescue => e
+      original_error.add_note("later retry failed: #{e.class}: #{e}")
       raise original_error
     end
 

data/lib/mongo/version.rb

@@ -17,5 +17,5 @@ module Mongo
   # The current version of the driver.
   #
   # @since 2.0.0
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.10.1'.freeze
 end

data/spec/integration/change_stream_spec.rb

@@ -94,7 +94,7 @@ describe 'Change stream integration', retry: 4 do
       it 'watch raises error' do
         expect do
           authorized_collection.watch
-        end.to raise_error(Mongo::Error::OperationFailure, "Failing command due to 'failCommand' failpoint (100)")
+        end.to raise_error(Mongo::Error::OperationFailure, /Failing command due to 'failCommand' failpoint \(100\)/)
       end
     end
 
@@ -243,7 +243,7 @@ describe 'Change stream integration', retry: 4 do
 
         expect do
           enum.next
-        end.to raise_error(Mongo::Error::OperationFailure, "Failing command due to 'failCommand' failpoint (101)")
+        end.to raise_error(Mongo::Error::OperationFailure, /Failing command due to 'failCommand' failpoint \(101\)/)
       end
     end
   end
@@ -354,7 +354,7 @@ describe 'Change stream integration', retry: 4 do
 
           expect do
             enum.try_next
-          end.to raise_error(Mongo::Error::OperationFailure, "Failing command due to 'failCommand' failpoint (101)")
+          end.to raise_error(Mongo::Error::OperationFailure, /Failing command due to 'failCommand' failpoint \(101\)/)
         end
       end
 
@@ -377,7 +377,7 @@ describe 'Change stream integration', retry: 4 do
 
           expect do
             enum.try_next
-          end.to raise_error(Mongo::Error::OperationFailure, "Failing command due to 'failCommand' failpoint (101)")
+          end.to raise_error(Mongo::Error::OperationFailure, /Failing command due to 'failCommand' failpoint \(101\)/)
         end
       end
     end

data/spec/integration/command_monitoring_spec.rb

@@ -107,7 +107,7 @@ describe 'Command monitoring' do
       subscriber.clear_events!
       expect do
         command.execute(server)
-      end.to raise_error(Mongo::Error::OperationFailure, 'Not enough data-bearing nodes (100)')
+      end.to raise_error(Mongo::Error::OperationFailure, /Not enough data-bearing nodes \(100\)/)
 
       expect(subscriber.started_events.length).to eq(1)
       event = subscriber.started_events.first

data/spec/integration/read_preference_spec.rb

@@ -409,7 +409,7 @@ describe 'Read preference' do
             res = collection.find({}, {session: session}.merge(find_options || {})).to_a.count
             expect(res).to eq(1)
           end
-        end.to raise_error(Mongo::Error::InvalidTransactionOperation, "read preference in a transaction must be primary (requested: secondary)")
+        end.to raise_error(Mongo::Error::InvalidTransactionOperation, /read preference in a transaction must be primary \(requested: secondary\)/)
       end
     end
 
@@ -478,7 +478,7 @@ describe 'Read preference' do
             res = collection.find({}, {session: session}.merge(find_options || {})).to_a.count
             expect(res).to eq(1)
           end
-        end.to raise_error(Mongo::Error::InvalidTransactionOperation, "read preference in a transaction must be primary (requested: secondary)")
+        end.to raise_error(Mongo::Error::InvalidTransactionOperation, /read preference in a transaction must be primary \(requested: secondary\)/)
       end
     end
   end

data/spec/integration/retryable_writes_spec.rb

@@ -107,6 +107,18 @@ describe 'Retryable writes integration tests' do
             }.to raise_error(Mongo::Error::OperationFailure, /other error/)
             expect(expectation).to eq(unsuccessful_retry_value)
           end
+
+          it 'indicates server used for operation' do
+            expect {
+              operation
+            }.to raise_error(Mongo::Error::OperationFailure, /on #{ClusterConfig.instance.primary_address_str}/)
+          end
+
+          it 'indicates first attempt' do
+            expect {
+              operation
+            }.to raise_error(Mongo::Error::OperationFailure, /attempt 1/)
+          end
         end
       end
     end
@@ -169,16 +181,17 @@ describe 'Retryable writes integration tests' do
       end
 
       [
-        Mongo::Error::SocketError,
-        Mongo::Error::SocketTimeoutError,
-        Mongo::Error::OperationFailure.new('not master'),
-        Mongo::Error::OperationFailure.new('node is recovering'),
-      ].each do |retryable_error|
+        [Mongo::Error::SocketError],
+        [Mongo::Error::SocketTimeoutError],
+        [Mongo::Error::OperationFailure, 'not master'],
+        [Mongo::Error::OperationFailure, 'node is recovering'],
+      ].each do |error_cls, error_msg|
+        # Note: actual exception instances must be different between tests
 
-        context "when the first error is a #{retryable_error}" do
+        context "when the first error is a #{error_cls}/#{error_msg}" do
 
           let(:error) do
-            retryable_error
+            error_cls.new(error_msg)
           end
 
           before do
@@ -197,12 +210,24 @@ describe 'Retryable writes integration tests' do
               Mongo::Error::SocketError
             end
 
-            it 'does not retry writes and raises the second error' do
+            it 'raises the second error' do
               expect {
                 operation
               }.to raise_error(second_error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
+
+            it 'indicates server used for operation' do
+              expect {
+                operation
+              }.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
+            end
+
+            it 'indicates second attempt' do
+              expect {
+                operation
+              }.to raise_error(Mongo::Error, /attempt 2/)
+            end
           end
 
           context 'when the second error is a SocketTimeoutError' do
@@ -211,7 +236,7 @@ describe 'Retryable writes integration tests' do
               Mongo::Error::SocketTimeoutError
             end
 
-            it 'does not retry writes and raises the second error' do
+            it 'raises the second error' do
               expect {
                 operation
               }.to raise_error(second_error)
@@ -225,7 +250,7 @@ describe 'Retryable writes integration tests' do
               Mongo::Error::OperationFailure.new('not master')
             end
 
-            it 'does not retry writes and raises the second error' do
+            it 'raises the second error' do
               expect {
                 operation
               }.to raise_error(second_error)
@@ -253,12 +278,30 @@ describe 'Retryable writes integration tests' do
               StandardError
             end
 
-            it 'does not retry writes and raises the first error' do
+            it 'raises the first error' do
               expect {
                 operation
               }.to raise_error(error)
               expect(expectation).to eq(unsuccessful_retry_value)
             end
+
+            it 'indicates server used for operation' do
+              expect {
+                operation
+              }.to raise_error(Mongo::Error, /on #{ClusterConfig.instance.primary_address_str}/)
+            end
+
+            it 'indicates first attempt' do
+              expect {
+                operation
+              }.to raise_error(Mongo::Error, /attempt 1/)
+            end
+
+            it 'indicates retry was performed' do
+              expect {
+                operation
+              }.to raise_error(Mongo::Error, /later retry failed: StandardError/)
+            end
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Tyler Brock
@@ -31,7 +31,7 @@ cert_chain:
   bMYVwXXhV8czdzgkQB/ZPWHSbEWXnmkze1mzvqWBCPOVXYrcnL9cnEl/RoxtS1hr
   Db6Ac6mCUSYfYHBWpWqxjc45n70i5Xi1
   -----END CERTIFICATE-----
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson
@@ -140,6 +140,7 @@ files:
 - lib/mongo/database/view.rb
 - lib/mongo/dbref.rb
 - lib/mongo/error.rb
+- lib/mongo/error/auth_error.rb
 - lib/mongo/error/bulk_write_error.rb
 - lib/mongo/error/change_stream_resumable.rb
 - lib/mongo/error/closed_stream.rb
@@ -180,6 +181,7 @@ files:
 - lib/mongo/error/need_primary_server.rb
 - lib/mongo/error/no_server_available.rb
 - lib/mongo/error/no_srv_records.rb
+- lib/mongo/error/notable.rb
 - lib/mongo/error/operation_failure.rb
 - lib/mongo/error/parser.rb
 - lib/mongo/error/pool_closed_error.rb
@@ -355,11 +357,11 @@ files:
 - lib/mongo/operation/shared/polymorphic_lookup.rb
 - lib/mongo/operation/shared/polymorphic_result.rb
 - lib/mongo/operation/shared/read_preference_supported.rb
+- lib/mongo/operation/shared/response_handling.rb
 - lib/mongo/operation/shared/result/aggregatable.rb
 - lib/mongo/operation/shared/result/use_legacy_error_parser.rb
 - lib/mongo/operation/shared/sessions_supported.rb
 - lib/mongo/operation/shared/specifiable.rb
-- lib/mongo/operation/shared/unpinnable.rb
 - lib/mongo/operation/shared/write.rb
 - lib/mongo/operation/shared/write_concern_supported.rb
 - lib/mongo/operation/update.rb

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

@@ -1,39 +0,0 @@
-# Copyright (C) 2014-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
-  module Operation
-    module Unpinnable
-
-      private
-
-      # Unpins the session if the session is pinned and the yielded to block
-      # raises errors that are required to unpin the session.
-      #
-      # @note This method takes the session as an argument because Unpinnable
-      #   is included in BulkWrite which does not store the session in the
-      #   receiver (despite Specifiable doing so).
-      #
-      # @param [ Session | nil ] Session to consider.
-      def unpin_maybe(session)
-        yield
-      rescue Mongo::Error => e
-        if session
-          session.unpin_maybe(e)
-        end
-        raise
-      end
-    end
-  end
-end