bosh-director 1.2200.0 → 1.2291.0

data/lib/bosh/director.rb

@@ -71,6 +71,8 @@ require 'bosh/director/duration'
 require 'bosh/director/hash_string_vals'
 require 'bosh/director/instance_deleter'
 require 'bosh/director/instance_updater'
+require 'bosh/director/instance_updater/preparer'
+require 'bosh/director/instance_updater/network_updater'
 require 'bosh/director/job_runner'
 require 'bosh/director/job_updater'
 require 'bosh/director/job_queue'

data/lib/bosh/director/agent_client.rb

@@ -8,9 +8,16 @@ module Bosh::Director
 
     def self.with_defaults(id, options = {})
       defaults = {
-        retry_methods: { # in case of timeout errors
-                         get_state: 2,
-                         get_task: 2,
+        retry_methods: {
+          # in case of timeout errors
+          get_state: 2,
+
+          # get_task should retry at least once because some long running tasks
+          # (e.g. configure_networks) will restart the agent (current implementation)
+          # which most likely will result in first get_task message being lost
+          # because agent was not listening on NATS and second retry message
+          # will probably be received because agent came back up.
+          get_task: 2,
         }
       }
 
@@ -40,8 +47,17 @@ module Bosh::Director
       send_message(method_name, *args)
     end
 
-    def get_state(*args)
-      send_message(:get_state, *args)
+    # Define methods on this class to make instance_double more useful
+    [
+      :start,
+      :get_state,
+      :list_disk,
+      :prepare_network_change,
+      :prepare_configure_networks,
+    ].each do |message|
+      define_method(message) do |*args|
+        send_message(message, *args)
+      end
     end
 
     def prepare(*args)
@@ -84,6 +100,10 @@ module Bosh::Director
       send_long_running_message(:run_errand, *args)
     end
 
+    def configure_networks(*args)
+      send_long_running_message(:configure_networks, *args)
+    end
+
     def wait_until_ready(deadline = 600)
       old_timeout = @timeout
       @timeout = 1.0

data/lib/bosh/director/deployment_plan/job_spec_parser.rb

@@ -216,9 +216,13 @@ module Bosh::Director
             "Invalid state `#{@job.state}' for `#{@job.name}', valid states are: #{Job::VALID_JOB_STATES.join(", ")}"
         end
 
+        if @job.lifecycle == 'errand'
+          @job.resource_pool.reserve_errand_capacity(job_size)
+        else
+          @job.resource_pool.reserve_capacity(job_size)
+        end
         job_size.times do |index|
           @job.instances[index] = Instance.new(@job, index)
-          @job.resource_pool.reserve_capacity(1)
         end
       end
 

data/lib/bosh/director/deployment_plan/resource_pool.rb

@@ -64,6 +64,7 @@ module Bosh::Director
         @allocated_vms = []
         @active_vm_count = 0
         @required_capacity = 0
+        @errand_capacity = 0
       end
 
       # Returns resource pools spec as Hash (usually for agent to serialize)
@@ -138,6 +139,15 @@ module Bosh::Director
                 "#{@required_capacity} VMs needed, capacity is #{@size}"
         end
       end
+
+      def reserve_errand_capacity(n)
+        needed = n - @errand_capacity
+
+        if needed > 0
+          reserve_capacity(needed)
+          @errand_capacity = n
+        end
+      end
     end
   end
-end
+end

data/lib/bosh/director/instance_updater.rb

@@ -1,4 +1,3 @@
-require 'bosh/director/instance_preparer'
 require 'bosh/director/rendered_job_templates_cleaner'
 
 module Bosh::Director
@@ -30,6 +29,8 @@ module Bosh::Director
       @vm = @instance.model.vm
 
       @current_state = {}
+
+      @network_updater = NetworkUpdater.new(@instance, @vm, agent, self, @cloud, @logger)
     end
 
     def instance_name
@@ -60,7 +61,7 @@ module Bosh::Director
         return
       end
 
-      step { InstancePreparer.new(@instance, agent).prepare }
+      step { Preparer.new(@instance, agent).prepare }
       step { stop }
       step { take_snapshot }
 
@@ -428,32 +429,7 @@ module Bosh::Director
     end
 
     def update_networks
-      return unless @instance.networks_changed?
-
-      network_settings = @instance.network_settings
-
-      begin
-        # If configure_networks can't configure the network as
-        # requested, e.g. when the security groups change on AWS,
-        # configure_networks() will raise an exception and we'll
-        # recreate the VM to work around it
-        @cloud.configure_networks(@vm.cid, network_settings)
-      rescue Bosh::Clouds::NotSupported => e
-        @logger.info("configure_networks not supported: #{e.message}")
-        @instance.recreate = true
-        update_resource_pool
-        return
-      end
-
-      # Once CPI has configured the vm and stored the new network settings at the registry,
-      # we restart the agent via a 'prepare_network_change' message in order for the agent
-      # to pick up the new network settings.
-      agent.prepare_network_change(network_settings)
-
-      # Give some time to the agent to restart before pinging if it's ready (race condition)
-      sleep(5)
-
-      agent.wait_until_ready
+      @network_updater.update
     end
 
     def agent

data/lib/bosh/director/instance_updater/network_updater.rb

@@ -0,0 +1,110 @@
+module Bosh::Director
+  class InstanceUpdater::NetworkUpdater
+    def initialize(instance, vm_model, agent_client, resource_pool_updater, cloud, logger)
+      @instance = instance
+      @vm_model = vm_model
+      @agent_client = agent_client
+      @resource_pool_updater = resource_pool_updater
+      @cloud = cloud
+      @logger = logger
+    end
+
+    def update
+      unless @instance.networks_changed?
+        @logger.info('Skipping network re-configuration')
+        return
+      end
+
+      network_settings = @instance.network_settings
+      @logger.info("Planning to reconfigure network with settings: #{network_settings}")
+
+      strategies = [
+        ConfigureNetworksStrategy.new(@agent_client, network_settings, @logger),
+        PrepareNetworkChangeStrategy.new(@agent_client, network_settings, @logger),
+      ]
+
+      selected_strategy = strategies.find { |s| s.before_configure_networks }
+
+      @cloud.configure_networks(@vm_model.cid, network_settings)
+
+      selected_strategy.after_configure_networks
+
+    rescue Bosh::Clouds::NotSupported => e
+      # If configure_networks can't configure the network as
+      # requested, e.g. when the security groups change on AWS,
+      # configure_networks() will raise an exception and we'll
+      # recreate the VM to work around it
+      @logger.info("configure_networks CPI call failed with error: #{e.inspect}")
+      configure_new_vm
+    end
+
+    private
+
+    def configure_new_vm
+      @logger.info('Creating VM with new network configurations')
+      @instance.recreate = true
+      @resource_pool_updater.update_resource_pool
+    end
+
+    # Newer agents support prepare_configure_networks/configure_networks messages
+    class ConfigureNetworksStrategy
+      def initialize(agent_client, network_settings, logger)
+        @agent_client = agent_client
+        @network_settings = network_settings
+        @logger = logger
+      end
+
+      def before_configure_networks
+        @agent_client.prepare_configure_networks(@network_settings)
+        true
+      rescue RpcRemoteException => e
+        @logger.info("Agent returned error from prepare_configure_networks: #{e.inspect}")
+        raise unless e.message =~ /unknown message/
+        false
+      end
+
+      def after_configure_networks
+        # Some CPIs might power off and then power on vm to reconfigure network adapters,
+        # so Director needs to wait for agent to become responsive
+        @logger.info('Waiting for agent to become responsive')
+        @agent_client.wait_until_ready
+
+        @agent_client.configure_networks(@network_settings)
+      end
+    end
+
+    # Older agents only support prepare_network_change
+    class PrepareNetworkChangeStrategy
+      def initialize(agent_client, network_settings, logger)
+        @agent_client = agent_client
+        @network_settings = network_settings
+        @logger = logger
+      end
+
+      def before_configure_networks
+        true
+      end
+
+      def after_configure_networks
+        # Some CPIs might power off and then power on vm to reconfigure network adapters,
+        # so Director needs to wait for agent to become responsive
+        @logger.info('Waiting for agent to become responsive')
+        @agent_client.wait_until_ready
+
+        # Once CPI has configured the vm and stored the new network settings at the registry,
+        # we restart the agent via a 'prepare_network_change' message in order for the agent
+        # to pick up the new network settings.
+        @agent_client.prepare_network_change(@network_settings)
+
+        # Since current implementation of prepare_network_change is to kill the agent
+        # we need to wait until the agent is ready. However, we want to avoid
+        # talking to the old agent, so we need to wait for it to die.
+        @logger.info('Sleeping after prepare_network_change message')
+        sleep(5)
+
+        @logger.info('Waiting for agent to become responsive')
+        @agent_client.wait_until_ready
+      end
+    end
+  end
+end

data/lib/bosh/director/{instance_preparer.rb → instance_updater/preparer.rb}

@@ -1,7 +1,5 @@
-require 'bosh/director'
-
 module Bosh::Director
-  class InstancePreparer
+  class InstanceUpdater::Preparer
     def initialize(instance, agent_client)
       @instance = instance
       @agent_client = agent_client
@@ -10,7 +8,7 @@ module Bosh::Director
     def prepare
       @agent_client.prepare(@instance.spec) unless detached?
     rescue RpcRemoteException => e
-      raise unless e.message =~/unknown message/
+      raise unless e.message =~ /unknown message/
     end
 
     private

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2200.0'
+    VERSION = '1.2291.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2200.0
+  version: 1.2291.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +493,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  87cbf9'
+  51a1bb'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -636,8 +636,9 @@ files:
 - lib/bosh/director/ext.rb
 - lib/bosh/director/hash_string_vals.rb
 - lib/bosh/director/instance_deleter.rb
-- lib/bosh/director/instance_preparer.rb
 - lib/bosh/director/instance_updater.rb
+- lib/bosh/director/instance_updater/network_updater.rb
+- lib/bosh/director/instance_updater/preparer.rb
 - lib/bosh/director/ip_util.rb
 - lib/bosh/director/job_queue.rb
 - lib/bosh/director/job_renderer.rb
@@ -747,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1821926484481455025
+      hash: -4364815964196896981
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23