bosh_aws_cpi 1.5.0.pre.1504 → 1.5.0.pre.1525

data/lib/cloud/aws/resource_wait.rb

@@ -4,8 +4,10 @@ module Bosh::AwsCloud
   class ResourceWait
     include Helpers
 
-    DEFAULT_TRIES = 12 # a sane amount of retries on AWS (~25 minutes), as things can take anywhere between a minute and forevah
-    MAX_SLEEP_EXPONENT = 8
+    # a sane amount of retries on AWS (~25 minutes),
+    # as things can take anywhere between a minute and forever
+    DEFAULT_TRIES = 54
+    MAX_SLEEP_EXPONENT = 5
 
     def self.for_instance(args)
       raise ArgumentError, "args should be a Hash, but `#{args.class}' given" unless args.is_a?(Hash)
@@ -128,6 +130,15 @@ module Bosh::AwsCloud
       end
     end
 
+    def self.sleep_callback(description, tries)
+      lambda do |num_tries, error|
+        sleep_time = 2**[num_tries, MAX_SLEEP_EXPONENT].min # Exp backoff: 1, 2, 4, 8 ... up to max 32
+        Bosh::AwsCloud::ResourceWait.logger.debug("#{error.class}: `#{error.message}'") if error
+        Bosh::AwsCloud::ResourceWait.logger.debug("#{description}, retrying in #{sleep_time} seconds (#{num_tries}/#{tries})")
+        sleep_time
+      end
+    end
+
     def self.logger
       Bosh::Clouds::Config.logger
     end
@@ -140,7 +151,7 @@ module Bosh::AwsCloud
       @started_at = Time.now
     end
 
-    def for_resource(args)
+    def for_resource(args, &blk)
       resource = args.fetch(:resource)
       state_method = args.fetch(:state_method, :status)
       errors = args.fetch(:errors, [])
@@ -155,39 +166,28 @@ module Bosh::AwsCloud
       end
 
       state = nil
-      Bosh::Common.retryable(tries: tries, sleep: sleep_cb, on: errors, ensure: ensure_cb ) do
+      Bosh::Retryable.new(tries: tries, sleep: sleep_cb, on: errors, ensure: ensure_cb).retryer do
         Bosh::AwsCloud::ResourceWait.task_checkpoint
 
         state = resource.method(state_method).call
-
         if state == :error || state == :failed
           raise Bosh::Clouds::CloudError, "#{desc} state is #{state}, expected #{target_state}, took #{time_passed}s"
         end
 
         # the yielded block should return true if we have reached the target state
-        yield state
+        blk.call(state)
       end
 
       Bosh::AwsCloud::ResourceWait.logger.info("#{desc} is now #{state}, took #{time_passed}s")
     rescue Bosh::Common::RetryCountExceeded => e
-      Bosh::AwsCloud::ResourceWait.logger.error("Timed out waiting for #{desc} state is #{state}, expected to be #{target_state}, took #{time_passed}s")
+      Bosh::AwsCloud::ResourceWait.logger.error(
+        "Timed out waiting for #{desc} state is #{state}, expected to be #{target_state}, took #{time_passed}s")
       raise e
     end
 
     def time_passed
       Time.now - @started_at
     end
-
-    private
-
-    def self.sleep_callback(description, tries)
-      lambda do |num_tries, error|
-        sleep_time = 2**[num_tries, MAX_SLEEP_EXPONENT].min # Exp backoff: 1, 2, 4, 8 ... up to max 256
-        Bosh::AwsCloud::ResourceWait.logger.debug("#{error.class}: `#{error.message}'") if error
-        Bosh::AwsCloud::ResourceWait.logger.debug("#{description}, retrying in #{sleep_time} seconds (#{num_tries}/#{tries})")
-        sleep_time
-      end
-    end
   end
 end
 

data/lib/cloud/aws/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module AwsCloud
-    VERSION = '1.5.0.pre.1504'
+    VERSION = '1.5.0.pre.1525'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1504
+  version: 1.5.0.pre.1525
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1504
+        version: 1.5.0.pre.1525
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH AWS CPI
 
-  882c2b'
+  df3988'
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console