right_support 2.5.4 → 2.5.5

data/lib/right_support/db/cassandra_model.rb

@@ -99,7 +99,7 @@ end
 module RightSupport::DB
   # Exception that indicates database configuration info is missing.
   class MissingConfiguration < Exception; end
-
+  class UnsupportedRubyVersion < Exception; end
   # Base class for a column family in a keyspace
   # Used to access data persisted in Cassandra
   # Provides wrappers for Cassandra client methods
@@ -123,6 +123,11 @@ module RightSupport::DB
 
       @@connections = {}
 
+      # Depricate usage of CassandraModel under Ruby < 1.9
+      def inherited(base)
+        raise UnsupportedRubyVersion, "Support only Ruby >= 1.9" unless RUBY_VERSION >= "1.9"
+      end
+
       def config
         @@config
       end
@@ -270,7 +275,7 @@ module RightSupport::DB
             columns.merge!(chunk)
             if chunk.size == opt[:count]
               # Assume there are more chunks, use last key as start of next get
-              opt[:start] = chunk.keys.sort.last
+              opt[:start] = chunk.keys.last
             else
               # This must be the last chunk
               break
@@ -409,7 +414,7 @@ module RightSupport::DB
           end
           if chunk.size == count
             # Assume there are more chunks, use last key as start of next get
-            start = chunk.keys.sort.last
+            start = chunk.keys.last
           else
             # This must be the last chunk
             break
@@ -551,6 +556,7 @@ module RightSupport::DB
           config
         end
       end
+
     end # self
 
     attr_accessor :key, :attributes

data/lib/right_support/net/lb/health_check.rb

@@ -29,7 +29,8 @@ module RightSupport::Net::LB
   # instead of putting it here.
   class EndpointsStack
     DEFAULT_YELLOW_STATES = 4
-    DEFAULT_RESET_TIME    = 300
+    DEFAULT_RESET_TIME    = 60
+    INITIAL_N_LEVEL       = 1
 
     def initialize(policy, endpoints, yellow_states=nil, reset_time=nil, on_health_change=nil)
       @policy = policy
@@ -38,7 +39,15 @@ module RightSupport::Net::LB
       @reset_time = reset_time || DEFAULT_RESET_TIME
       @on_health_change = on_health_change
       @min_n_level = 0
-      endpoints.each { |ep| @endpoints[ep] = {:n_level => @min_n_level, :timestamp => 0} }
+      endpoints.each { |ep| @endpoints[ep] = {:n_level => INITIAL_N_LEVEL, :timestamp => 0} }
+    end
+
+    def inspect
+      "<#{self.class.name}: #{get_stats.inspect}>"
+    end
+
+    def to_s
+      inspect
     end
 
     def sweep
@@ -72,7 +81,7 @@ module RightSupport::Net::LB
 
     def state_color(n_level)
       color = 'green' if n_level == 0
-      color = 'red' if n_level == @yellow_states
+      color = 'red' if n_level >= @yellow_states
       color = "yellow-#{n_level}" if n_level > 0 && n_level < @yellow_states
       color
     end
@@ -85,9 +94,13 @@ module RightSupport::Net::LB
       stats
     end
 
-    def update!(endpoints)
-      @endpoints.each { |k,v| endpoints.include?(k) ? endpoints.delete(k) : @endpoints.delete(k) }
-      endpoints.each  { |ep| @endpoints[ep] = {:n_level => @min_n_level, :timestamp => 0} }
+    # Replace the set of endpoints that this object knows about. If any
+    # endpoint in the new set is already being tracked, remember its
+    # health. For any new endpoint, set its health to INITIAL_N_LEVEL.
+
+    def update!(new_endpoints)
+      @endpoints.each { |k,v| new_endpoints.include?(k) ? new_endpoints.delete(k) : @endpoints.delete(k) }
+      new_endpoints.each  { |ep| @endpoints[ep] = {:n_level => INITIAL_N_LEVEL, :timestamp => 0} }
     end
 
     # Return the logger that our surrounding policy uses

data/lib/right_support/net/request_balancer.rb

@@ -1,7 +1,21 @@
 module RightSupport::Net
   # Raised to indicate the (uncommon) error condition where a RequestBalancer rotated
-  # through EVERY URL in a list without getting a non-nil, non-timeout response. 
-  class NoResult < Exception; end
+  # through EVERY URL in a list without getting a non-nil, non-timeout response.
+  #
+  # If the NoResult was due to a series of errors, then the #details attribute
+  # of this exception will let you access detailed information about the errors encountered
+  # while retrying the network request. #details is a Hash, the keys of which are endpoints,
+  # and the values of which are arrays of exceptions that we encountered while making
+  # requests to that endpoint.
+  class NoResult < Exception
+    # @return [Hash] a map of {endpoint => [exception_1, exception2, ...], ...}
+    attr_reader :details
+
+    def initialize(message, details={})
+      super(message)
+      @details = details
+    end
+  end
 
   # Utility class that allows network requests to be randomly distributed across
   # a set of network endpoints. Generally used for REST requests by passing an
@@ -38,7 +52,9 @@ module RightSupport::Net
     DEFAULT_FATAL_EXCEPTIONS = [
       NoMemoryError, SystemStackError, SignalException, SystemExit,
       ScriptError,
-      #Subclasses of StandardError, which we can't mention directly
+      # Subclasses of StandardError. We can't include the base class directly as
+      # a fatal exception, because there are some retryable exceptions that derive
+      # from StandardError.
       ArgumentError, IndexError, LocalJumpError, NameError, RangeError,
       RegexpError, ThreadError, TypeError, ZeroDivisionError
     ]
@@ -186,22 +202,21 @@ module RightSupport::Net
         @policy.set_endpoints(@ips)
       end
 
-      exceptions = []
+      exceptions = {}
       result     = nil
       complete   = false
       n          = 0
 
       loop do
-        if complete
-          break
-        else
+        if n > 0
           do_retry = @options[:retry] || DEFAULT_RETRY_PROC
           do_retry = do_retry.call(@ips || @endpoints, n) if do_retry.respond_to?(:call)
           break if (do_retry.is_a?(Integer) && n >= do_retry) || [nil, false].include?(do_retry)
         end
 
         endpoint, need_health_check  = @policy.next
-        raise NoResult, "No endpoints are available" unless endpoint
+        break unless endpoint
+
         n += 1
         t0 = Time.now
 
@@ -231,7 +246,8 @@ module RightSupport::Net
             raise(to_raise)
           else
             @policy.bad(endpoint, t0, Time.now)
-            exceptions << e
+            exceptions[endpoint] ||= []
+            exceptions[endpoint] << e
           end
         end
 
@@ -239,14 +255,20 @@ module RightSupport::Net
 
       return result if complete
 
-      exceptions = exceptions.map { |e| e.class.name }.uniq.join(', ')
-      msg = "No available endpoints from #{(@ips || @endpoints).inspect}! Exceptions: #{exceptions}"
+      # Produce a summary message for the exception that gives a bit of detail
+      summary = []
+      exceptions.each_pair do |_, list|
+        list.each { |e| summary << e.class }
+      end
+      summary = summary.uniq.join(', ')
+      msg = "Request failed after #{n} tries to #{exceptions.keys.size} endpoints. Exceptions: #{summary}"
+
       logger.error "RequestBalancer: #{msg}"
-      raise NoResult, msg
+      raise NoResult.new(msg, exceptions)
     end
 
     # Provide an interface so one can query the RequestBalancer for statistics on
-    # it's endpoints.  Merely proxies the balancing policy's get_stats method. If
+    # 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.
     # 

data/right_support.gemspec

@@ -7,10 +7,10 @@ spec = Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.7")
 
   s.name    = 'right_support'
-  s.version = '2.5.4'
-  s.date    = '2012-10-05'
+  s.version = '2.5.5'
+  s.date    = '2012-10-18'
 
-  s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin']
+  s.authors = ['Tony Spataro', 'Sergey Sergyenko', 'Ryan Williamson', 'Lee Kirchhoff', 'Sergey Enin', 'Alexey Karpik']
   s.email   = 'support@rightscale.com'
   s.homepage= 'https://github.com/rightscale/right_support'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 2
   - 5
-  - 4
-  version: 2.5.4
+  - 5
+  version: 2.5.5
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,11 +15,12 @@ authors:
 - Ryan Williamson
 - Lee Kirchhoff
 - Sergey Enin
+- Alexey Karpik
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-10-05 00:00:00 -07:00
+date: 2012-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: []