right_support 2.6.16 → 2.6.17

data/lib/right_support/net/dns.rb

@@ -69,14 +69,47 @@ module RightSupport::Net
     # @raise URI::InvalidURIError if endpoints contains an invalid or URI
     # @raise SocketError if endpoints contains an invalid or unresolvable hostname
     def self.resolve(endpoints, opts={})
+      resolved_hostnames = resolve_with_hostnames(endpoints, opts)
+      resolved_endpoints = []
+      resolved_hostnames.each_value{ |v| resolved_endpoints.concat(v) }
+      return resolved_endpoints
+    end
+
+    # Similar to resolve, but return a hash of { hostnames => [endpoints] }
+    #
+    # Perform DNS resolution on a set of endpoints, where the endpoints may be hostnames or URIs.
+    # Expand out the list to include one entry per distinct address that is assigned to a given
+    # hostname, but preserve other aspects of the endpoints --. URIs will remain URIs with the
+    # same protocol, path-info, and so forth, but the hostname component will be resolved to IP
+    # addresses and the URI will be duplicated in the output, once for each distinct IP address.
+    #
+    # Although this method does accept IPv4 dotted-quad addresses as input, it does not accept
+    # IPv6 addresses. However, given hostnames or URIs as input, one _can_ resolve the hostnames
+    # to IPv6 addresses by specifying the appropriate address_family in the options.
+    #
+    # It should never be necessary to specify a different :socket_type or :protocol, but these
+    # options are exposed just in case.
+    #
+    # @param [Array<String>] endpoints a mixed list of hostnames, IPv4 addresses or URIs that contain them
+    # @option opts [Integer] :retry number of times to retry SocketError; default is 3
+    # @option opts [Integer] :address_family what kind of IP addresses to resolve; default is Socket::AF_INET (IPv4)
+    # @option opts [Integer] :socket_type socket-type context to pass to getaddrinfo, default is Socket::SOCK_STREAM
+    # @option opts [Integer] :protocol protocol context to pass to getaddrinfo, default is Socket::IPPROTO_TCP
+    #
+    # @return [Hash<hostnames => [endpoints]>] Hash with keys of hostnames and values of arrays of all associated IP addresses
+    #
+    # @raise URI::InvalidURIError if endpoints contains an invalid or URI
+    # @raise SocketError if endpoints contains an invalid or unresolvable hostname
+    def self.resolve_with_hostnames(endpoints, opts={})
       opts = DEFAULT_RESOLVE_OPTIONS.merge(opts)
       endpoints = [endpoints] unless endpoints.respond_to?(:each)
 
-      resolved_endpoints = []
+      hostname_hash = {}
       retries = 0
 
       endpoints.each do |endpoint|
         begin
+          resolved_endpoints = []
           if endpoint.include?(':')
             # It contains a colon, therefore it must be a URI -- we don't support IPv6
             uri = URI.parse(endpoint)
@@ -100,6 +133,7 @@ module RightSupport::Net
               resolved_endpoints << info[3]
             end
           end
+          hostname_hash[endpoint.to_s] = resolved_endpoints
         rescue SocketError => e
           retries += 1
           if retries < opts[:retry]
@@ -110,7 +144,7 @@ module RightSupport::Net
         end
       end
 
-      resolved_endpoints
+      hostname_hash
     end
 
   end

data/lib/right_support/net/request_balancer.rb

@@ -190,6 +190,17 @@ module RightSupport::Net
       end
     end
 
+    # Un-resolve an IP address.
+    #
+    # === Parameters
+    # endpoint:: a network endpoint (e.g. HTTP URL) to be un-resolved
+    #
+    # === Return
+    # Return the first hostname that resolved to the IP (there should only ever be one)
+    def lookup_hostname(endpoint)
+      @resolved_hostnames.select{ |k,v| v.include?(endpoint) }.shift[0]
+    end
+
     # Perform a request.
     #
     # === Block
@@ -268,11 +279,18 @@ module RightSupport::Net
       return result if complete
 
       # Produce a summary message for the exception that gives a bit of detail
-      msg = [] 
+      msg = []
+      stats = get_stats
       exceptions.each_pair do |endpoint, list|
         summary = []
         list.each { |e| summary << e.class }
-        msg << "'#{endpoint}' => [#{summary.uniq.join(', ')}]"
+        health = stats[endpoint] if stats[endpoint] != 'n/a'
+        if @resolved_hostnames
+          hostname = lookup_hostname(endpoint)
+          msg << "'#{hostname}' (#{endpoint}#{", "+health if health}) => [#{summary.uniq.join(', ')}]"
+        else
+          msg << "'#{endpoint}' #{"("+health+")" if health} => [#{summary.uniq.join(', ')}]"
+        end
       end
       message = "Request failed after #{n} tries to #{exceptions.keys.size} endpoints: (#{msg.join(', ')})"
 
@@ -284,7 +302,7 @@ module RightSupport::Net
     # its endpoints.  Merely proxies the balancing policy's get_stats method. If
     # no method exists in the balancing policy, a hash of endpoints with "n/a" is
     # returned.
-    # 
+    #
     # Examples
     #
     # A RequestBalancer created with endpoints [1,2,3,4,5] and using a HealthCheck
@@ -310,8 +328,9 @@ module RightSupport::Net
     def handle_exception(endpoint, e, t0)
       fatal    = fatal_exception?(e)
       duration = sprintf('%.4f', Time.now - t0)
-      msg      = "RequestBalancer: rescued #{fatal ? 'fatal' : 'retryable'} #{e.class.name} " +
-                 "during request to #{endpoint}: #{e.message} after #{duration} seconds"
+      ept      = @resolved_hostnames ? "#{lookup_hostname(endpoint)}(#{endpoint})" : "#{endpoint}"
+      msg      = "RequestBalancer: rescued #{fatal ? 'fatal' : 'retryable'} #{e.class.name} " + 
+                 "during request to #{ept}: #{e.message} after #{duration} seconds"
       logger.error msg
       @options[:on_exception].call(fatal, e, endpoint) if @options[:on_exception]
 
@@ -342,7 +361,9 @@ module RightSupport::Net
     end
 
     def resolve
-      resolved_endpoints = RightSupport::Net::DNS.resolve(@endpoints)
+      @resolved_hostnames = RightSupport::Net::DNS.resolve_with_hostnames(@endpoints)
+      resolved_endpoints = []
+      @resolved_hostnames.each_value{ |v| resolved_endpoints.concat(v) }
       logger.info("RequestBalancer: resolved #{@endpoints.inspect} to #{resolved_endpoints.inspect}")
       @ips = resolved_endpoints
       @policy.set_endpoints(@ips)

data/lib/right_support/stats/helpers.rb

@@ -106,13 +106,15 @@ module RightSupport
     # === Return
     # (String|Array|Hash):: Value(s) converted to decimal digit string
     def self.enough_precision(value)
-      scale = [1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0]
-      enough = lambda { |v| (v >= 10.0   ? 0 :
-                            (v >= 1.0    ? 1 :
-                            (v >= 0.1    ? 2 :
-                            (v >= 0.01   ? 3 :
-                            (v >  0.001  ? 4 :
-                            (v >  0.0    ? 5 : 0)))))) }
+      scale = [1.0, 10.0, 100.0, 1000.0, 10000.0, 100000.0, 1000000.0]
+      enough = lambda { |v| v = v.abs
+                            (v >= 10.0      ? 0 :
+                            (v >= 1.0       ? 1 :
+                            (v >= 0.1       ? 2 :
+                            (v >= 0.01      ? 3 :
+                            (v >= 0.001     ? 4 :
+                            (v >= 0.0001    ? 5 :
+                            (v >= 0.0000005 ? 6 : 0))))))) }
       digit_str = lambda { |p, v| sprintf("%.#{p}f", (v * scale[p]).round / scale[p])}
 
       if value.is_a?(Float)

data/right_support.gemspec

@@ -7,8 +7,8 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.6.16'
-  s.date    = '2013-01-28'
+  s.version = '2.6.17'
+  s.date    = '2013-01-29'
 
   s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik', 'Scott Messier']
   s.email   = 'support@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 2
   - 6
-  - 16
-  version: 2.6.16
+  - 17
+  version: 2.6.17
 platform: ruby
 authors: 
 - Tony Spataro
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-28 00:00:00 -08:00
+date: 2013-01-29 00:00:00 -08:00
 default_executable: 
 dependencies: []