mongo 2.1.0.beta → 2.2.0

data/lib/mongo/server/monitor.rb

@@ -35,16 +35,6 @@ module Mongo
       # @since 2.0.0
       MIN_SCAN_FREQUENCY = 0.5.freeze
 
-      # The command used for determining server status.
-      #
-      # @since 2.0.0
-      STATUS = { :ismaster => 1 }.freeze
-
-      # The constant for the ismaster command.
-      #
-      # @since 2.0.0
-      ISMASTER = Protocol::Query.new(Database::ADMIN, Database::COMMAND, STATUS, :limit => -1)
-
       # The weighting factor (alpha) for calculating the average moving round trip time.
       #
       # @since 2.0.0
@@ -140,7 +130,7 @@ module Mongo
       #
       # @since 2.0.0
       def stop!
-        @thread.kill && @thread.stop?
+        connection.disconnect! && @thread.kill && @thread.stop?
       end
 
       # Restarts the server monitor unless the current thread is alive.
@@ -170,10 +160,9 @@ module Mongo
         @mutex.synchronize do
           start = Time.now
           begin
-            result = connection.dispatch([ ISMASTER ]).documents[0]
-            return result, calculate_average_round_trip_time(start)
+            return connection.ismaster, calculate_average_round_trip_time(start)
           rescue Exception => e
-            log_debug([ e.message ])
+            log_debug(e.message)
             return {}, calculate_average_round_trip_time(start)
           end
         end

data/lib/mongo/server.rb

@@ -92,6 +92,21 @@ module Mongo
       Context.new(self)
     end
 
+    # Determine if a connection to the server is able to be established and
+    # messages can be sent to it.
+    #
+    # @example Is the server connectable?
+    #   server.connectable?
+    #
+    # @return [ true, false ] If the server is connectable.
+    #
+    # @since 2.1.0
+    def connectable?
+      context.with_connection do |connection|
+        connection.connectable?
+      end
+    end
+
     # Disconnect the server from the connection.
     #
     # @example Disconnect the server.
@@ -101,12 +116,23 @@ module Mongo
     #
     # @since 2.0.0
     def disconnect!
-      context.with_connection do |connection|
-        connection.disconnect!
-      end
+      pool.disconnect!
       monitor.stop! and true
     end
 
+    # When the server is flagged for garbage collection, stop the monitor
+    # thread.
+    #
+    # @example Finalize the object.
+    #   Server.finalize(monitor)
+    #
+    # @param [ Server::Monitor ] monitor The server monitor.
+    #
+    # @since 2.2.0
+    def self.finalize(monitor)
+      proc { monitor.stop! }
+    end
+
     # Instantiate a new server object. Will start the background refresh and
     # subscribe to the appropriate events.
     #
@@ -132,6 +158,7 @@ module Mongo
       @monitor = Monitor.new(address, event_listeners, options)
       monitor.scan!
       monitor.run!
+      ObjectSpace.define_finalizer(self, self.class.finalize(monitor))
     end
 
     # Get a pretty printed server inspection.
@@ -155,7 +182,7 @@ module Mongo
     #
     # @since 2.0.0
     def pool
-      @pool ||= ConnectionPool.get(self)
+      @pool ||= cluster.pool(self)
     end
 
     # Determine if the provided tags are a subset of the server's tags.

data/lib/mongo/server_selector/selectable.rb

@@ -20,17 +20,6 @@ module Mongo
     # @since 2.0.0
     module Selectable
 
-      # The max latency in seconds between the closest server and other servers
-      # considered for selection.
-      #
-      # @since 2.0.0
-      LOCAL_THRESHOLD = 0.015.freeze
-
-      # How long to block for server selection before throwing an exception.
-      #
-      # @since 2.0.0
-      SERVER_SELECTION_TIMEOUT = 30.freeze
-
       # @return [ Hash ] options The options.
       attr_reader :options
 
@@ -53,24 +42,42 @@ module Mongo
 
       # Initialize the server selector.
       #
-      # @example Initialize the preference with tag sets.
-      #   Mongo::ServerSelector::Secondary.new([{ 'tag' => 'set' }])
+      # @example Initialize the selector.
+      #   Mongo::ServerSelector::Secondary.new(:tag_sets => [{'dc' => 'nyc'}])
       #
       # @example Initialize the preference with no options.
       #   Mongo::ServerSelector::Secondary.new
       #
-      # @param [ Array ] tag_sets The tag sets used to select servers.
+      # @param [ Hash ] options The server preference options.
       #
-      # @todo: document specific error
-      # @raise [ Exception ] If tag sets are specified but not allowed.
+      # @option options [ Integer ] :server_selection_timeout The timeout in seconds
+      #   for selecting a server.
+      #
+      # @option options [ Integer ] :local_threshold The local threshold boundary for
+      #  nearest selection in seconds.
+      #
+      # @raise [ Error::InvalidServerPreference ] If tag sets are specified
+      #   but not allowed.
       #
       # @since 2.0.0
-      def initialize(tag_sets = [], options = {})
-        if !tag_sets.all? { |set| set.empty? } && !tags_allowed?
-          raise Error::InvalidServerPreference.new(name)
-        end
-        @tag_sets = tag_sets
-        @options = options
+      def initialize(options = {})
+        @options = (options || {}).freeze
+        tag_sets = options[:tag_sets] || []
+        validate_tag_sets!(tag_sets)
+        @tag_sets = tag_sets.freeze
+      end
+
+      # Inspect the server selector.
+      #
+      # @example Inspect the server selector.
+      #   selector.inspect
+      #
+      # @return [ String ] The inspection.
+      #
+      # @since 2.2.0
+      def inspect
+        "#<#{self.class.name}:0x#{object_id} tag_sets=#{tag_sets.inspect} " +
+        "server_selection_timeout=#{server_selection_timeout} local_threshold=#{local_threshold}>"
       end
 
       # Select a server from eligible candidates.
@@ -83,17 +90,20 @@ module Mongo
       # @return [ Mongo::Server ] A server matching the server preference.
       #
       # @since 2.0.0
-      def select_server(cluster)
+      def select_server(cluster, ping = true)
         deadline = Time.now + server_selection_timeout
         while (deadline - Time.now) > 0
-          if cluster.single?
-            servers = cluster.servers
-          elsif cluster.sharded?
-            servers = near_servers(cluster.servers)
-          else
-            servers = select(cluster.servers)
+          servers = candidates(cluster)
+          if servers && !servers.compact.empty?
+            server = servers.first
+            # There is no point pinging a standalone as the subsequent scan is
+            # not going to change anything about the cluster.
+            if ping && !cluster.single?
+              return server if server.connectable?
+            else
+              return server
+            end
           end
-          return servers.first if servers && !servers.compact.empty?
           cluster.scan!
         end
         raise Error::NoServerAvailable.new(self)
@@ -109,7 +119,7 @@ module Mongo
       # @since 2.0.0
       def server_selection_timeout
         @server_selection_timeout ||=
-          (options[:server_selection_timeout] || SERVER_SELECTION_TIMEOUT)
+          (options[:server_selection_timeout] || ServerSelector::SERVER_SELECTION_TIMEOUT)
       end
 
       # Get the local threshold boundary for nearest selection in seconds.
@@ -121,11 +131,21 @@ module Mongo
       #
       # @since 2.0.0
       def local_threshold
-        @local_threshold ||= (options[:local_threshold] || LOCAL_THRESHOLD)
+        @local_threshold ||= (options[:local_threshold] || ServerSelector::LOCAL_THRESHOLD)
       end
 
       private
 
+      def candidates(cluster)
+        if cluster.single?
+          cluster.servers
+        elsif cluster.sharded?
+          near_servers(cluster.servers)
+        else
+          select(cluster.servers)
+        end
+      end
+
       # Select the primary from a list of provided candidates.
       #
       # @param [ Array ] candidates List of candidate servers to select the
@@ -186,6 +206,12 @@ module Mongo
         end
         matches || []
       end
+
+      def validate_tag_sets!(tag_sets)
+        if !tag_sets.all? { |set| set.empty? } && !tags_allowed?
+          raise Error::InvalidServerPreference.new(name)
+        end
+      end
     end
   end
 end

data/lib/mongo/server_selector.rb

@@ -27,6 +27,22 @@ module Mongo
   module ServerSelector
     extend self
 
+    # The max latency in seconds between the closest server and other servers
+    # considered for selection.
+    #
+    # @since 2.0.0
+    LOCAL_THRESHOLD = 0.015.freeze
+
+    # How long to block for server selection before throwing an exception.
+    #
+    # @since 2.0.0
+    SERVER_SELECTION_TIMEOUT = 30.freeze
+
+    # Primary read preference.
+    #
+    # @since 2.1.0
+    PRIMARY = Options::Redacted.new(mode: :primary).freeze
+
     # Hash lookup for the selector classes based off the symbols
     #   provided in configuration.
     #
@@ -43,20 +59,13 @@ module Mongo
     #
     # @example Get a server selector object for selecting a secondary with
     #   specific tag sets.
-    #   Mongo::ServerSelector.get({ :mode => :secondary, :tag_sets => [{'dc' => 'nyc'}] })
+    #   Mongo::ServerSelector.get(:mode => :secondary, :tag_sets => [{'dc' => 'nyc'}])
     #
     # @param [ Hash ] preference The server preference.
-    # @param [ Hash ] options The preference options.
-    #
-    # @option preference :mode [ Symbol ] The preference mode.
-    # @option preference :tag_sets [ Array<Hash> ] The tag sets.
     #
     # @since 2.0.0
-    def get(preference = {}, options = {})
-      PREFERENCES.fetch(preference[:mode] || :primary).new(
-        preference[:tag_sets] || [],
-        options
-      )
+    def get(preference = {})
+      PREFERENCES.fetch(preference[:mode] || :primary).new(preference)
     end
   end
 end

data/lib/mongo/socket/ssl.rb

@@ -93,7 +93,10 @@ module Mongo
       #
       # @since 2.0.0
       def readbyte
-        handle_errors { socket.read(1) }
+        handle_errors do
+          byte = socket.read(1).bytes.to_a[0]
+          byte.nil? ? raise(EOFError) : byte
+        end
       end
 
       private

data/lib/mongo/socket/tcp.rb

@@ -51,8 +51,8 @@ module Mongo
       # Initializes a new TCP socket.
       #
       # @example Create the TCP socket.
-      #   TCP.new('::1', 27017, 30)
-      #   TCP.new('127.0.0.1', 27017, 30)
+      #   TCP.new('::1', 27017, 30, Socket::PF_INET)
+      #   TCP.new('127.0.0.1', 27017, 30, Socket::PF_INET)
       #
       # @param [ String ] host The hostname or IP address.
       # @param [ Integer ] port The port number.

data/lib/mongo/socket/unix.rb

@@ -38,25 +38,22 @@ module Mongo
       #
       # @since 2.0.0
       def connect!
-        Timeout.timeout(timeout, Error::SocketTimeoutError) do
-          handle_errors { socket.connect(path) }
-          self
-        end
+        self
       end
 
       # Initializes a new Unix socket.
       #
       # @example Create the Unix socket.
-      #   Unix.new('/path/to.sock', 27017, 30)
+      #   Unix.new('/path/to.sock', 5)
       #
       # @param [ String ] path The path.
       # @param [ Float ] timeout The socket timeout value.
-      # @param [ Integer ] family The socket family.
       #
       # @since 2.0.0
-      def initialize(path, timeout, family)
+      def initialize(path, timeout)
         @path, @timeout = path, timeout
-        super(family)
+        @socket = ::UNIXSocket.new(path)
+        set_socket_options(@socket)
       end
     end
   end

data/lib/mongo/socket.rb

@@ -54,7 +54,7 @@ module Mongo
     #
     # @return [ true, false ] If the socket is alive.
     #
-    # @since 2.0.0
+    # @deprecated Use #connectable? on the connection instead.
     def alive?
       sock_arr = [ @socket ]
       if Kernel::select(sock_arr, nil, sock_arr, 0)
@@ -172,11 +172,18 @@ module Mongo
       @socket.read(length) || String.new
     end
 
+    def unix_socket?(sock)
+      defined?(UNIXSocket) && sock.is_a?(UNIXSocket)
+    end
+
     def set_socket_options(sock)
-      encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
       sock.set_encoding(BSON::BINARY)
-      sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
-      sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+
+      unless unix_socket?(sock) && BSON::Environment.jruby?
+        encoded_timeout = [ timeout, 0 ].pack(TIMEOUT_PACK)
+        sock.setsockopt(SOL_SOCKET, SO_RCVTIMEO, encoded_timeout)
+        sock.setsockopt(SOL_SOCKET, SO_SNDTIMEO, encoded_timeout)
+      end
     end
 
     def handle_errors