mongo 2.8.0 → 2.9.0.rc0

data/lib/mongo/monitoring/event/cmap/connection_ready.rb

@@ -0,0 +1,64 @@
+# 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 Monitoring
+    module Event
+      module Cmap
+
+        # Event published when a connection is ready to be used for operations.
+        #
+        # @since 2.9.0
+        class ConnectionReady < Base
+
+          # @return [ Mongo::Address ] address The address of the server the connection is connected
+          #   to.
+          #
+          # @since 2.9.0
+          attr_reader :address
+
+          # @return [ Integer ] connection_id The ID of the connection.
+          #
+          # @since 2.9.0
+          attr_reader :connection_id
+
+          # Create the event.
+          #
+          # @example Create the event.
+          #   ConnectionReady.new(address, id)
+          #
+          # @since 2.9.0
+          # @api private
+          def initialize(address, id)
+            @address = address
+            @connection_id = id
+          end
+
+          # Returns a concise yet useful summary of the event.
+          #
+          # @return [ String ] String summary of the event.
+          #
+          # @note This method is experimental and subject to change.
+          #
+          # @since 2.9.0
+          # @api experimental
+          def summary
+            "#<#{self.class.name.sub(/^Mongo::Monitoring::Event::Cmap::/, '')} " +
+                "address=#{address} connection_id=#{connection_id}>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/monitoring/event/cmap/pool_cleared.rb

@@ -0,0 +1,57 @@
+# 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 Monitoring
+    module Event
+      module Cmap
+
+        # Event published when a connection pool is cleared.
+        #
+        # @since 2.9.0
+        class PoolCleared < Base
+
+          # @return [ Mongo::Address ] address The address of the server the pool's connections will
+          #   connect to.
+          #
+          # @since 2.9.0
+          attr_reader :address
+
+          # Create the event.
+          #
+          # @example Create the event.
+          #   PoolCleared.new(address)
+          #
+          # @since 2.9.0
+          # @api private
+          def initialize(address)
+            @address = address
+          end
+
+          # Returns a concise yet useful summary of the event.
+          #
+          # @return [ String ] String summary of the event.
+          #
+          # @note This method is experimental and subject to change.
+          #
+          # @since 2.9.0
+          # @api experimental
+          def summary
+            "#<#{self.class.name.sub(/^Mongo::Monitoring::Event::Cmap::/, '')} address=#{address}>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/monitoring/event/cmap/pool_closed.rb

@@ -0,0 +1,57 @@
+# 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 Monitoring
+    module Event
+      module Cmap
+
+        # Event published when a connection pool is closed.
+        #
+        # @since 2.9.0
+        class PoolClosed < Base
+
+          # @return [ Mongo::Address ] address The address of the server the pool's connections will
+          #   connect to.
+          #
+          # @since 2.9.0
+          attr_reader :address
+
+          # Create the event.
+          #
+          # @example Create the event.
+          #   PoolClosed.new(address)
+          #
+          # @since 2.9.0
+          # @api private
+          def initialize(address)
+            @address = address
+          end
+
+          # Returns a concise yet useful summary of the event.
+          #
+          # @return [ String ] String summary of the event.
+          #
+          # @note This method is experimental and subject to change.
+          #
+          # @since 2.9.0
+          # @api experimental
+          def summary
+            "#<#{self.class.name.sub(/^Mongo::Monitoring::Event::Cmap::/, '')} address=#{address}>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/monitoring/event/cmap/pool_created.rb

@@ -0,0 +1,63 @@
+# 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 Monitoring
+    module Event
+      module Cmap
+
+        # Event published when a connection pool is created.
+        #
+        # @since 2.9.0
+        class PoolCreated < Base
+
+          # @return [ Mongo::Address ] address The address of the server the pool's connections will
+          #   connect to.
+          #
+          # @since 2.9.0
+          attr_reader :address
+
+          # @return [ Hash ] options Options specified for pool creation.
+          #
+          # @since 2.9.0
+          attr_reader :options
+
+          # Create the event.
+          #
+          # @example Create the event.
+          #   PoolCreated.new(address, options)
+          #
+          # @since 2.9.0
+          # @api private
+          def initialize(address, options)
+            @address = address
+            @options = options.dup.freeze
+          end
+
+          # Returns a concise yet useful summary of the event.
+          #
+          # @return [ String ] String summary of the event.
+          #
+          # @note This method is experimental and subject to change.
+          #
+          # @since 2.9.0
+          # @api experimental
+          def summary
+            "#<#{self.class.name.sub(/^Mongo::Monitoring::Event::Cmap::/, '')} address=#{address} options=#{options}>"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/mongo/monitoring/event/command_started.rb

@@ -40,6 +40,11 @@ module Mongo
         # @return [ Integer ] request_id The request id.
         attr_reader :request_id
 
+        # object_id of the socket object used for this command.
+        #
+        # @api private
+        attr_reader :socket_object_id
+
         # Create the new event.
         #
         # @example Create the event.
@@ -53,13 +58,16 @@ module Mongo
         #
         # @since 2.1.0
         # @api private
-        def initialize(command_name, database_name, address, request_id, operation_id, command)
+        def initialize(command_name, database_name, address, request_id,
+          operation_id, command, socket_object_id = nil
+        )
           @command_name = command_name.to_s
           @database_name = database_name
           @address = address
           @request_id = request_id
           @operation_id = operation_id
           @command = redacted(command_name, command)
+          @socket_object_id = socket_object_id
         end
 
         # Create the event from a wire protocol message payload.
@@ -75,14 +83,15 @@ module Mongo
         #
         # @since 2.1.0
         # @api private
-        def self.generate(address, operation_id, payload)
+        def self.generate(address, operation_id, payload, socket_object_id = nil)
           new(
             payload[:command_name],
             payload[:database_name],
             address,
             payload[:request_id],
             operation_id,
-            payload[:command]
+            payload[:command],
+            socket_object_id,
           )
         end
 

data/lib/mongo/monitoring/publishable.rb

@@ -24,6 +24,7 @@ module Mongo
       # @return [ Monitoring ] monitoring The monitoring.
       attr_reader :monitoring
 
+      # @deprecated
       def publish_event(topic, event)
         monitoring.succeeded(topic, event)
       end
@@ -35,12 +36,19 @@ module Mongo
         monitoring.succeeded(topic, event)
       end
 
+      def publish_cmap_event(event)
+        return unless monitoring?
+
+        monitoring.published(Monitoring::CONNECTION_POOL, event)
+      end
+
       private
 
-      def command_started(address, operation_id, payload)
+      def command_started(address, operation_id, payload, socket_object_id = nil)
         monitoring.started(
           Monitoring::COMMAND,
-          Event::CommandStarted.generate(address, operation_id, payload)
+          Event::CommandStarted.generate(address, operation_id, payload,
+            socket_object_id)
         )
       end
 

data/lib/mongo/operation.rb

@@ -1,4 +1,3 @@
-require 'forwardable'
 require 'mongo/operation/result'
 
 require 'mongo/operation/shared/executable'

data/lib/mongo/operation/find/legacy/result.rb

@@ -21,6 +21,7 @@ module Mongo
         #
         # @since 2.1.0
         class Result < Operation::Result
+          include Operation::Result::UseLegacyErrorParser
 
           # Determine if the query was a success.
           #

data/lib/mongo/operation/list_collections/result.rb

@@ -77,7 +77,13 @@ module Mongo
           if successful?
             self
           else
-            raise(Error::OperationFailure.new(parser.message, self))
+            raise Error::OperationFailure.new(
+              parser.message,
+              self,
+              code: parser.code,
+              code_name: parser.code_name,
+              labels: parser.labels,
+              wtimeout: parser.wtimeout)
           end
         end
 

data/lib/mongo/operation/result.rb

@@ -13,6 +13,7 @@
 # limitations under the License.
 
 require 'mongo/operation/shared/result/aggregatable'
+require 'mongo/operation/shared/result/use_legacy_error_parser'
 
 module Mongo
   module Operation
@@ -79,8 +80,9 @@ module Mongo
       # @return [ Array<Protocol::Reply> ] replies The wrapped wire protocol replies.
       attr_reader :replies
 
+      # @api private
       def_delegators :parser,
-        :not_master?, :node_recovering?
+        :not_master?, :node_recovering?, :node_shutting_down?
 
       # Is the result acknowledged?
       #
@@ -330,6 +332,13 @@ module Mongo
         @labels ||= parser.labels
       end
 
+      # Whether the operation failed with a write concern error.
+      #
+      # @api private
+      def write_concern_error?
+        !!(first_document && first_document['writeConcernError'])
+      end
+
       private
 
       def aggregate_returned_count

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

@@ -45,10 +45,25 @@ module Mongo
 
       def process_result(result, server)
         server.update_cluster_time(result)
+
         if result.not_master? || result.node_recovering?
+          if result.node_shutting_down?
+            disconnect_pool = true
+          else
+            # Max wire version needs to be checked prior to marking the
+            # server unknown
+            disconnect_pool = server.description.max_wire_version < 8
+          end
+
           server.unknown!
+
+          if disconnect_pool
+            server.pool.disconnect!
+          end
+
           server.monitor.scan_semaphore.signal
         end
+
         session.process(result) if session
         result
       end

data/lib/mongo/operation/shared/result/use_legacy_error_parser.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
+  module Operation
+    class Result
+
+      # This module creates the Parser instance in legacy mode.
+      #
+      # @api private
+      module UseLegacyErrorParser
+        def parser
+          @parser ||= Error::Parser.new(first_document, replies, legacy: true)
+        end
+      end
+    end
+  end
+end

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

@@ -101,11 +101,6 @@ module Mongo
       # @since 2.0.0
       SELECTOR = :selector.freeze
 
-      # The startTransaction option
-      #
-      # @since 2.6.0
-      START_TRANSACTION = :start_transaction.freeze
-
       # The field for number to return.
       #
       # @since 2.0.0
@@ -558,17 +553,6 @@ module Mongo
         selector[Operation::ARRAY_FILTERS] if selector
       end
 
-      # The startTransaction option.
-      #
-      # @example Get the startTransaction option.
-      #   specifiable.start_transaction
-      #
-      # @return  [ Boolean ] The startTransaction option.
-      #
-      def start_transaction
-        @spec[START_TRANSACTION]
-      end
-
       # Does the operation have an acknowledged write concern.
       #
       # @example Determine whether the operation has an acknowledged write.