Merge pull request #602 from estolfo/FREE-72862-resolvers

FREE-72862 Refactor resolvers and address to try different protocol families

Author: estolfo

lib/mongo/address.rb

@@ -25,13 +25,22 @@ module Mongo
   class Address
     extend Forwardable
 
-    # Delegate the ip, host, and port methods to the resolver.
+    # Mapping from socket family to resolver class.
     #
     # @since 2.0.0
-    def_delegators :@resolver, :host, :port, :socket, :seed, :to_s
+    FAMILY_MAP = { ::Socket::PF_UNIX => Unix,
+                   ::Socket::AF_INET6 => IPv6,
+                   ::Socket::AF_INET => IPv4
+                 }
 
-    # @return [ Integer ] port The port to the connect to.
-    attr_reader :resolver
+    # @return [ String ] address The seed address.
+    attr_reader :seed
+
+    # @return [ String ] host The original host name.
+    attr_reader :host
+
+    # @return [ Integer ] port The port.
+    attr_reader :port
 
     # Check equality of the address to another.
     #
@@ -88,13 +97,8 @@ def hash
     #
     # @since 2.0.0
     def initialize(seed, options = {})
-      address = seed.downcase
-      host, port = match(address)
-      case family(host)
-        when ::Socket::PF_UNIX then @resolver = Unix.new(host, address)
-        when ::Socket::AF_INET6 then @resolver = IPv6.new(host, port, address)
-        else @resolver = IPv4.new(host, port, address)
-      end
+      @seed = seed
+      @host, @port = parse_host_port
     end
 
     # Get a pretty printed address inspection.
@@ -106,17 +110,55 @@ def initialize(seed, options = {})
     #
     # @since 2.0.0
     def inspect
-      "#<Mongo::Address:0x#{object_id} address=#{resolver.to_s}>"
+      "#<Mongo::Address:0x#{object_id} address=#{to_s}>"
+    end
+
+    # Get a socket for the provided address, given the options.
+    #
+    # @example Get a socket.
+    #   address.socket(5, :ssl => true)
+    #
+    # @param [ Float ] timeout The socket timeout.
+    # @param [ Hash ] ssl_options SSL options.
+    #
+    # @return [ Pool::Socket::SSL, Pool::Socket::TCP, Pool::Socket::Unix ] The socket.
+    #
+    # @since 2.0.0
+    def socket(timeout, ssl_options = {})
+      @resolver ||= initialize_resolver!(timeout, ssl_options)
+      @resolver.socket(timeout, ssl_options)
+    end
+
+    # Get the address as a string.
+    #
+    # @example Get the address as a string.
+    #   address.to_s
+    #
+    # @return [ String ] The nice string.
+    #
+    # @since 2.0.0
+    def to_s
+      port ? "#{host}:#{port}" : host
     end
 
     private
 
-    def family(host)
-      fam = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
-      ::Socket.getaddrinfo(host, nil, fam, ::Socket::SOCK_STREAM).first[4]
+    def initialize_resolver!(timeout, ssl_options)
+      family = (host == 'localhost') ? ::Socket::AF_INET : ::Socket::AF_UNSPEC
+      ::Socket.getaddrinfo(host, nil, family, ::Socket::SOCK_STREAM).detect do |info|
+        begin
+          return FAMILY_MAP[info[4]].new(host, port).tap do |res|
+            res.socket(timeout, ssl_options).connect!
+          end
+        rescue IOError, SystemCallError => e
+          error = e
+        end
+      end
+      raise error
     end
 
-    def match(address)
+    def parse_host_port
+      address = seed.downcase
       case address
         when Unix::MATCH then Unix.parse(address)
         when IPv6::MATCH then IPv6.parse(address)

lib/mongo/address/ipv4.rb

@@ -27,9 +27,6 @@ class IPv4
       # @return [ Integer ] port The port.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match an IPv4 ip address.
       #
       # @since 2.0.0
@@ -59,13 +56,11 @@ def self.parse(address)
       #
       # @param [ String ] host The host.
       # @param [ Integer ] port The port.
-      # @param [ String ] address The seed address.
       #
       # @since 2.0.0
-      def initialize(host, port, address)
+      def initialize(host, port)
         @host = host
         @port = port
-        @seed = address
       end
 
       # Get a socket for the provided address type, given the options.
@@ -86,18 +81,6 @@ def socket(timeout, ssl_options = {})
           Socket::TCP.new(host, port, timeout, Socket::PF_INET)
         end
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      def to_s
-        "#{host}:#{port}"
-      end
     end
   end
 end

lib/mongo/address/ipv6.rb

@@ -27,9 +27,6 @@ class IPv6
       # @return [ Integer ] port The port.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match an IPv6 ip address.
       #
       # @since 2.0.0
@@ -59,13 +56,11 @@ def self.parse(address)
       #
       # @param [ String ] host The host.
       # @param [ Integer ] port The port.
-      # @param [ String ] address The seed address.
       #
       # @since 2.0.0
-      def initialize(host, port, address)
+      def initialize(host, port)
         @host = host
         @port = port
-        @seed = address
       end
 
       # Get a socket for the provided address type, given the options.
@@ -86,18 +81,6 @@ def socket(timeout, ssl_options = {})
           Socket::TCP.new(host, port, timeout, Socket::PF_INET6)
         end
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      def to_s
-        "#{host}:#{port}"
-      end
     end
   end
 end

lib/mongo/address/unix.rb

@@ -26,9 +26,6 @@ class Unix
       # @return [ nil ] port Will always be nil.
       attr_reader :port
 
-      # @return [ String ] seed The seed address.
-      attr_reader :seed
-
       # The regular expression to use to match a socket path.
       #
       # @since 2.0.0
@@ -54,12 +51,10 @@ def self.parse(address)
       #   Unix.new("/path/to/socket.sock", "/path/to/socket.sock")
       #
       # @param [ String ] host The host.
-      # @param [ String ] address The seed address.
       #
       # @since 2.0.0
-      def initialize(host, address)
+      def initialize(host)
         @host = host
-        @seed = address
       end
 
       # Get a socket for the provided address type, given the options.
@@ -76,16 +71,6 @@ def initialize(host, address)
       def socket(timeout, ssl_options = {})
         Socket::Unix.new(host, timeout, Socket::AF_UNIX)
       end
-
-      # Get the address as a string.
-      #
-      # @example Get the address as a string.
-      #   ipv4.to_s
-      #
-      # @return [ String ] The nice string.
-      #
-      # @since 2.0.0
-      alias :to_s :host
     end
   end
 end

spec/mongo/address/ipv4_spec.rb

@@ -3,7 +3,7 @@
 describe Mongo::Address::IPv4 do
 
   let(:resolver) do
-    described_class.new(*described_class.parse(address), address)
+    described_class.new(*described_class.parse(address))
   end
 
   describe 'self.parse' do

spec/mongo/address/ipv6_spec.rb

@@ -8,7 +8,7 @@
   end
 
   let(:resolver) do
-    described_class.new(*described_class.parse(address), address)
+    described_class.new(*described_class.parse(address))
   end
 
   describe 'self.parse' do

spec/mongo/address/unix_spec.rb

@@ -8,7 +8,7 @@
   end
 
   let(:resolver) do
-    described_class.new(*described_class.parse(address), address)
+    described_class.new(*described_class.parse(address))
   end
 
   describe 'self.parse' do