bosh_aws_cpi 1.2624.0 → 1.2640.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c1b37050bd67d039345b8b90bf88c0e868aacd3e
+  data.tar.gz: a28a34c9e788be45602aea0374f5c26341097b36
+SHA512:
+  metadata.gz: 6e5a5175fa211acd62d96f28d206af92b92a8ed71e411560f20652f529a713c6a39889db9922668b43379edd4e724d0f4bfbfbca200a3eac2bdb79f0deda4d7c
+  data.tar.gz: f9c44f0e8cb3f1d9e5d4be9e27aecb38d7ae0ae5bf65890bb76a6d283d87de38ff69766ad14652291e68da2eedb3e164427799a9af6f20d82a1e6484756921b7

data/lib/cloud/aws/instance_manager.rb

@@ -34,16 +34,8 @@ module Bosh::AwsCloud
       
       if resource_pool["spot_bid_price"]
         @logger.info("Launching spot instance...")
-        security_group_ids = []
-        @region.security_groups.each do |group|
-           security_group_ids << group.security_group_id if @instance_params[:security_groups].include?(group.name)
-        end 
-        spot_request_spec = create_spot_request_spec(instance_params, security_group_ids, resource_pool["spot_bid_price"])
-        @logger.debug("Requesting spot instance with: #{spot_request_spec.inspect}")
-        spot_instance_requests = @region.client.request_spot_instances(spot_request_spec) 
-        @logger.debug("Got spot instance requests: #{spot_instance_requests.inspect}") 
-        
-        wait_for_spot_instance_request_to_be_active spot_instance_requests
+        spot_manager = Bosh::AwsCloud::SpotManager.new(@region)
+        @instance = spot_manager.create(instance_params, resource_pool["spot_bid_price"])
       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
@@ -76,50 +68,6 @@ module Bosh::AwsCloud
       instance
     end
 
-    def create_spot_request_spec(instance_params, security_group_ids, spot_price) {
-      spot_price: "#{spot_price}",
-      instance_count: 1,
-      valid_until: "#{(Time.now + 20*60).utc.iso8601}",
-      launch_specification: {
-        image_id: instance_params[:image_id],
-        key_name: instance_params[:key_name],
-        instance_type: instance_params[:instance_type],
-        user_data: Base64.encode64(instance_params[:user_data]),
-        placement: {
-          availability_zone: instance_params[:availability_zone]
-        },
-        network_interfaces: [ 
-          { 
-            subnet_id: instance_params[:subnet].subnet_id,
-            groups: security_group_ids,
-            device_index: 0,
-            private_ip_address: instance_params[:private_ip_address]
-          } 
-        ]
-      }
-    }
-    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]
 
@@ -241,4 +189,4 @@ module Bosh::AwsCloud
 
     def instance_create_wait_time; 30; end
   end
-end
+end

data/lib/cloud/aws/spot_manager.rb

@@ -0,0 +1,127 @@
+require "common/common"
+require "time"
+
+module Bosh::AwsCloud
+  class SpotManager
+    TOTAL_WAIT_TIME_IN_SECONDS = 300
+    RETRY_COUNT = 10
+
+    def initialize(region)
+      @region = region
+      @logger = Bosh::Clouds::Config.logger
+    end
+
+    def create(instance_params, spot_bid_price)
+      spot_request_spec = create_spot_request_spec(instance_params, spot_bid_price)
+      @logger.debug("Requesting spot instance with: #{spot_request_spec.inspect}")
+
+      begin
+        @spot_instance_requests = @region.client.request_spot_instances(spot_request_spec)
+        @logger.debug("Got spot instance requests: #{@spot_instance_requests.inspect}")
+      rescue => e
+        raise Bosh::Clouds::VMCreationFailed.new(false), e.inspect
+      end
+
+      request_spot_instance
+    end
+
+    private
+
+    def request_spot_instance
+      instance = nil
+
+      # 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: TOTAL_WAIT_TIME_IN_SECONDS/RETRY_COUNT, tries: RETRY_COUNT, on: errors) do |_, error|
+        @logger.warn("Retrying after expected error: #{error}") if error
+
+        status = spot_instance_request_status
+        case status[:state]
+          when 'failed'
+            fail_spot_creation("VM spot instance creation failed: #{status.inspect}")
+          when 'open'
+            if status[:status] != nil && status[:status][:code] == 'price-too-low'
+              fail_spot_creation("Cannot create VM spot instance because bid price is too low: #{status.inspect}")
+            end
+          when 'active'
+            @logger.info("Spot request instances fulfilled: #{status.inspect}")
+            instance = @region.instances[status[:instance_id]]
+            true
+        end
+      end
+
+      instance
+    rescue Bosh::Common::RetryCountExceeded
+      @logger.warn("Timed out waiting for spot request #{@spot_instance_requests.inspect} to be fulfilled")
+      cancel_pending_spot_requests
+      raise Bosh::Clouds::VMCreationFailed.new(true)
+    end
+
+    def create_spot_request_spec(instance_params, spot_price)
+      spec = {
+        spot_price: "#{spot_price}",
+        instance_count: 1,
+        launch_specification: {
+          image_id: instance_params[:image_id],
+          key_name: instance_params[:key_name],
+          instance_type: instance_params[:instance_type],
+          user_data: Base64.encode64(instance_params[:user_data]),
+          placement: {
+            availability_zone: instance_params[:availability_zone]
+          },
+          network_interfaces: [
+            {
+              subnet_id: instance_params[:subnet].subnet_id,
+              device_index: 0,
+              private_ip_address: instance_params[:private_ip_address]
+            }
+          ]
+        }
+      }
+      security_groups = resolve_security_group_ids(instance_params[:security_groups])
+      unless security_groups.empty?
+        spec[:launch_specification][:network_interfaces][0][:groups] = security_groups
+      end
+
+      spec
+    end
+
+    def spot_instance_request_status
+      @logger.debug('Checking state of spot instance requests...')
+      response = @region.client.describe_spot_instance_requests(
+        spot_instance_request_ids: spot_instance_request_ids
+      )
+      status = response[:spot_instance_request_set][0] # There is only ever 1
+      @logger.debug("Spot instance request status: #{status.inspect}")
+      status
+    end
+
+    def fail_spot_creation(message)
+      @logger.error(message)
+      cancel_pending_spot_requests
+      raise Bosh::Clouds::VMCreationFailed.new(false), message
+    end
+
+    def spot_instance_request_ids
+      @spot_instance_requests[:spot_instance_request_set].map { |r| r[:spot_instance_request_id] }
+    end
+
+    def cancel_pending_spot_requests
+      @logger.warn("Failed to create spot instance: #{@spot_instance_requests.inspect}. Cancelling request...")
+      cancel_response = @region.client.cancel_spot_instance_requests(
+        spot_instance_request_ids: spot_instance_request_ids
+      )
+      @logger.warn("Spot cancel request returned: #{cancel_response.inspect}")
+    end
+
+    def resolve_security_group_ids(security_group_names)
+      return [] unless security_group_names
+      @region.security_groups.inject([]) do |security_group_ids, group|
+        security_group_ids << group.security_group_id if security_group_names.include?(group.name)
+        security_group_ids
+      end
+    end
+  end
+end

data/lib/cloud/aws/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module AwsCloud
-    VERSION = '1.2624.0'
+    VERSION = '1.2640.0'
   end
 end

data/lib/cloud/aws.rb

@@ -32,6 +32,7 @@ require "cloud/aws/dynamic_network"
 require "cloud/aws/manual_network"
 require "cloud/aws/vip_network"
 require "cloud/aws/instance_manager"
+require "cloud/aws/spot_manager"
 require "cloud/aws/tag_manager"
 require "cloud/aws/availability_zone_selector"
 require "cloud/aws/resource_wait"

metadata

@@ -1,84 +1,74 @@
 --- !ruby/object:Gem::Specification
 name: bosh_aws_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2624.0
-  prerelease: 
+  version: 1.2640.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-01 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.44.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.44.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2624.0
+        version: 1.2640.0
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -94,28 +83,27 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.2
-description: ! 'BOSH AWS CPI
-
-  03f604'
+description: |-
+  BOSH AWS CPI
+  986896
 email: support@cloudfoundry.com
 executables:
 - bosh_aws_console
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - bin/bosh_aws_console
 - lib/bosh_aws_cpi.rb
 - lib/cloud/aws.rb
@@ -130,6 +118,7 @@ files:
 - lib/cloud/aws/network.rb
 - lib/cloud/aws/network_configurator.rb
 - lib/cloud/aws/resource_wait.rb
+- lib/cloud/aws/spot_manager.rb
 - lib/cloud/aws/stemcell.rb
 - lib/cloud/aws/stemcell_creator.rb
 - lib/cloud/aws/stemcell_finder.rb
@@ -137,33 +126,28 @@ files:
 - lib/cloud/aws/version.rb
 - lib/cloud/aws/vip_network.rb
 - scripts/stemcell-copy.sh
-- README.md
 homepage: https://github.com/cloudfoundry/bosh
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3736547469633169504
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: BOSH AWS CPI
 test_files: []