right_support 1.0.9 → 1.0.11

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

@@ -110,11 +110,10 @@ module RightSupport::Net::Balancing
       # Selection of the next endpoint using RoundRobin
       @counter += 1 unless endpoints.size < @last_size
       @counter = 0 if @counter == endpoints.size
-      i = @counter % endpoints.size
       @last_size = endpoints.size
       
       # Returns false or true, depending on whether EP is yellow or not
-      [ endpoints[i][0], endpoints[i][1][:n_level] != 0 ]
+      [ endpoints[@counter][0], endpoints[@counter][1][:n_level] != 0 ]
     end
 
     def good(endpoint, t0, t1)
@@ -126,7 +125,20 @@ module RightSupport::Net::Balancing
     end
     
     def health_check(endpoint)
-      @stack.increase_state(endpoint,t0,Time.now) unless @health_check.call(endpoint)      
+      t0 = Time.now
+      result = @health_check.call(endpoint)
+      t1 = Time.now
+      if result
+        @stack.decrease_state(endpoint, t0, t1)
+        return true
+      else
+        @stack.increase_state(endpoint, t0, t1)
+        return false
+      end
+    rescue Exception => e
+      t1 = Time.now
+      @stack.increase_state(endpoint, t0, t1)
+      raise e
     end
 
     # Proxy to EndpointStack

data/lib/right_support/net/balancing/round_robin.rb

@@ -39,5 +39,10 @@ module RightSupport::Net::Balancing
     def bad(endpoint, t0, t1)
       #no-op; round robin does not care about failures
     end
+
+    def health_check(endpoint)
+      #no-op; round robin does not perform health checks
+      true
+    end
   end
 end

data/lib/right_support/net/request_balancer.rb

@@ -137,7 +137,6 @@ module RightSupport::Net
       n          = 0
 
       retry_opt     = @options[:retry] || DEFAULT_RETRY_PROC
-      health_check  = @options[:health_check]
 
       loop do
         if complete
@@ -145,7 +144,7 @@ module RightSupport::Net
         else
           max_n = retry_opt
           max_n = max_n.call(@endpoints, n) if max_n.respond_to?(:call)
-          break if (max_n.is_a?(Integer) && n >= max_n) || !(max_n)
+          break if (max_n.is_a?(Integer) && n >= max_n) || [nil, false].include?(max_n)
         end
 
         endpoint, need_health_check  = @policy.next
@@ -154,12 +153,15 @@ module RightSupport::Net
         n += 1
         t0 = Time.now
 
-        # HealthCheck goes here
+        # Perform health check if necessary. Note that we guard this with a rescue, because the
+        # health check may raise an exception and we want to log the exception info if this happens.
         if need_health_check
           begin
-            @policy.health_check(endpoint)
+            unless @policy.health_check(endpoint)
+              log_error("RequestBalancer: health check failed to #{endpoint} because of non-true return value")
+              next
+            end
           rescue Exception => e
-            @policy.bad(endpoint, t0, Time.now)
             log_error("RequestBalancer: health check failed to #{endpoint} because of #{e.class.name}: #{e.message}")
             next
           end
@@ -173,7 +175,7 @@ module RightSupport::Net
           complete = true
           break
         rescue Exception => e
-          if to_raise = handle_exception(endpoint, e)
+          if to_raise = handle_exception(endpoint, e, t0)
             raise(to_raise)
           else
             @policy.bad(endpoint, t0, Time.now)
@@ -218,7 +220,7 @@ module RightSupport::Net
 
     # Decide what to do with an exception. The decision is influenced by the :fatal
     # option passed to the constructor.
-    def handle_exception(endpoint, e)
+    def handle_exception(endpoint, e, t0)
       fatal = @options[:fatal] || DEFAULT_FATAL_PROC
 
       #The option may be a proc or lambda; call it to get input
@@ -232,7 +234,8 @@ module RightSupport::Net
       #whether the exception we're handling is an instance of any mentioned exception
       #class
       fatal = fatal.any?{ |c| e.is_a?(c) } if fatal.respond_to?(:any?)
-      msg = "RequestBalancer: rescued #{fatal ? 'fatal' : 'retryable'} #{e.class.name} during request to #{endpoint}: #{e.message}"
+      duration = sprintf('%.4f', Time.now - t0)
+      msg = "RequestBalancer: rescued #{fatal ? 'fatal' : 'retryable'} #{e.class.name} during request to #{endpoint}: #{e.message} after #{duration} seconds"
       log_error msg
       @options[:on_exception].call(fatal, e, endpoint) if @options[:on_exception]
 

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 = '1.0.9'
-  s.date    = '2011-10-17'
+  s.version = '1.0.11'
+  s.date    = '2011-10-21'
 
   s.authors = ['Tony Spataro']
   s.email   = 'tony@rightscale.com'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Tony Spataro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 -07:00
+date: 2011-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency