bosh_aws_cpi 1.2559.0 → 1.2560.0

data/lib/cloud/aws/instance_manager.rb

@@ -43,18 +43,7 @@ module Bosh::AwsCloud
         spot_instance_requests = @region.client.request_spot_instances(spot_request_spec) 
         @logger.debug("Got spot instance requests: #{spot_instance_requests.inspect}") 
         
-        Bosh::Common.retryable(sleep: instance_create_wait_time*2, tries: 20) do |tries, error|
-            @logger.debug("Checking state of spot instance requests...")
-            spot_instance_request_ids = spot_instance_requests[:spot_instance_request_set].map { |r| r[:spot_instance_request_id] } 
-            response = @region.client.describe_spot_instance_requests(:spot_instance_request_ids => spot_instance_request_ids)
-            statuses = response[:spot_instance_request_set].map { |rr| rr[:state] }
-            @logger.debug("Spot instance request states: #{statuses.inspect}")
-            if statuses.all? { |s| s == 'active' }
-               @logger.info("Spot request instances fulfilled: #{response.inspect}")
-               instance_id = response[:spot_instance_request_set].map { |rr| rr[:instance_id] }[0]
-               @instance = @region.instances[instance_id]
-            end
-        end
+        wait_for_spot_instance_request_to_be_active spot_instance_requests
       else
         # Retry the create instance operation a couple of times if we are told that the IP
         # address is in use - it can happen when the director recreates a VM and AWS
@@ -111,6 +100,26 @@ module Bosh::AwsCloud
     }
     end
 
+    def wait_for_spot_instance_request_to_be_active(spot_instance_requests)
+      # Query the spot request state until it becomes "active".
+      # This can result in the errors listed below; this is normally because AWS has 
+      # been slow to update its state so the correct response is to wait a bit and try again.
+      errors = [AWS::EC2::Errors::InvalidSpotInstanceRequestID::NotFound]
+      Bosh::Common.retryable(sleep: instance_create_wait_time*2, tries: 20, on: errors) do |tries, error|
+          @logger.warn("Retrying after expected error: #{error}") if error
+          @logger.debug("Checking state of spot instance requests...")
+          spot_instance_request_ids = spot_instance_requests[:spot_instance_request_set].map { |r| r[:spot_instance_request_id] } 
+          response = @region.client.describe_spot_instance_requests(:spot_instance_request_ids => spot_instance_request_ids)
+          statuses = response[:spot_instance_request_set].map { |rr| rr[:state] }
+          @logger.debug("Spot instance request states: #{statuses.inspect}")
+          if statuses.all? { |s| s == 'active' }
+             @logger.info("Spot request instances fulfilled: #{response.inspect}")
+             instance_id = response[:spot_instance_request_set].map { |rr| rr[:instance_id] }[0]
+             @instance = @region.instances[instance_id]
+          end
+      end
+    end
+
     def terminate(instance_id, fast=false)
       @instance = @region.instances[instance_id]
 

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2559.0'
+    VERSION = '1.2560.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2559.0
+  version: 1.2560.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-16 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.2559.0
+        version: 1.2560.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2559.0
+        version: 1.2560.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2559.0
+        version: 1.2560.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2559.0
+        version: 1.2560.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2559.0
+        version: 1.2560.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2559.0
+        version: 1.2560.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: 0.8.2
 description: ! 'BOSH AWS CPI
 
-  664e0d'
+  2bb07f'
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1836125855612603795
+      hash: -271901431206060787
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23