Merge pull request #23 from rightscale/CF-2242_KHR_retry_after_strategy

CF-2242 - added new retry strategy to handle 'Retry-After' header

lib/base/api_manager.rb

@@ -195,7 +195,7 @@ def self.set_routine(*new_routines)
       #   A set of options for how retry behavior works.
       #   available retry options
       #   :count => Integer # number of retry attempts
-      #   :strategy => Symbol # retry strategy[ :exponentional (default), :full_jitter, :equal_jitter, :decorrelated_jitter]
+      #   :strategy => Symbol # retry strategy[ :exponentional (default), :full_jitter, :equal_jitter, :decorrelated_jitter, :retry_after]
       #   :reiteration_time => Integer # maximum amount of time to allow for retries
       #   :sleep_time => Integer # base sleep time in seconds, actual sleep time depends on strategy and count
       #

lib/base/routines/retry_manager.rb

@@ -93,6 +93,8 @@ def process
                        when :decorrelated_jitter
                          # sleep = random_between(base, previous_sleep * 3)
                          rand * (3*previous_sleep - base_sleep_time) + base_sleep_time
+                       when :retry_after
+                         Array((@data[:response][:instance].headers || {})["Retry-After"]).first.to_i
                        else # default behavior, exponential
                          base_sleep_time * 2**(attempt-1)
                        end

lib/base/routines/routine.rb

@@ -28,7 +28,7 @@ module CloudApi
     #
     # The routine is a very simple object that does a simple task in the API call processing stack
     # and exits. In most cases a single routine knows nothing about any other routines. It just
-    # takes incoming params from @data hash, processes it and stores back to the @adata attribute.
+    # takes incoming params from @data hash, processes it and stores back to the @data attribute.
     #
     class Routine
       attr_reader :data