bosh-director 1.2168.0 → 1.2175.0

data/lib/bosh/director.rb

@@ -66,6 +66,7 @@ require 'bosh/director/vm_data'
 require 'bosh/director/vm_reuser'
 require 'bosh/director/deployment_plan'
 require 'bosh/director/deployment_plan/assembler'
+require 'bosh/director/errand'
 require 'bosh/director/duration'
 require 'bosh/director/hash_string_vals'
 require 'bosh/director/instance_deleter'

data/lib/bosh/director/deployment_plan.rb

@@ -12,6 +12,7 @@ require 'bosh/director/deployment_plan/network_subnet'
 require 'bosh/director/deployment_plan/compiled_package'
 require 'bosh/director/deployment_plan/preparer'
 require 'bosh/director/deployment_plan/resource_pools'
+require 'bosh/director/deployment_plan/instance_vm_binder'
 require 'bosh/director/deployment_plan/multi_job_updater'
 require 'bosh/director/deployment_plan/updater'
 require 'bosh/director/deployment_plan/release_version'
@@ -23,3 +24,5 @@ require 'bosh/director/deployment_plan/dynamic_network'
 require 'bosh/director/deployment_plan/manual_network'
 require 'bosh/director/deployment_plan/vip_network'
 require 'bosh/director/deployment_plan/planner'
+require 'bosh/director/deployment_plan/dns_binder'
+

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

@@ -2,7 +2,6 @@ module Bosh::Director
   # DeploymentPlan::Assembler is used to populate deployment plan with information
   # about existing deployment and information from director DB
   class DeploymentPlan::Assembler
-    include DnsHelper
     include LockHelper
     include IpUtil
 
@@ -266,27 +265,11 @@ module Bosh::Director
     # resource pool if necessary)
     # @return [void]
     def bind_unallocated_vms
-      @deployment_plan.jobs.each do |job|
-        job.instances.each do |instance|
-          instance.bind_unallocated_vm
-          # Now that we know every VM has been allocated and instance models are
-          # bound, we can sync the state.
-          instance.sync_state_with_db
-        end
-      end
+      @deployment_plan.jobs_starting_on_deploy.each(&:bind_unallocated_vms)
     end
 
     def bind_instance_networks
-      @deployment_plan.jobs.each do |job|
-        job.instances.each do |instance|
-          instance.network_reservations.each do |name, reservation|
-            unless reservation.reserved?
-              network = @deployment_plan.network(name)
-              network.reserve!(reservation, "`#{job.name}/#{instance.index}'")
-            end
-          end
-        end
-      end
+      @deployment_plan.jobs_starting_on_deploy.each(&:bind_instance_networks)
     end
 
     # Binds template models for each release spec in the deployment plan
@@ -328,84 +311,22 @@ module Bosh::Director
     # Calculates configuration checksums for all jobs in this deployment plan
     # @return [void]
     def bind_configuration
-      @deployment_plan.jobs.each do |job|
+      @deployment_plan.jobs_starting_on_deploy.each do |job|
         JobRenderer.new(job).render_job_instances(@blobstore)
       end
     end
 
     def bind_dns
-      domain = Models::Dns::Domain.find_or_create(:name => dns_domain_name,
-                                                  :type => 'NATIVE')
-      @deployment_plan.dns_domain = domain
-
-      soa_record = Models::Dns::Record.find_or_create(:domain_id => domain.id,
-                                                      :name => dns_domain_name,
-                                                      :type => 'SOA')
-      soa_record.content = SOA
-      soa_record.ttl = 300
-      soa_record.save
-
-      # add NS record
-      Models::Dns::Record.find_or_create(:domain_id => domain.id,
-                                         :name => dns_domain_name,
-                                         :type =>'NS', :ttl => TTL_4H,
-                                         :content => dns_ns_record)
-      # add A record for name server
-      Models::Dns::Record.find_or_create(:domain_id => domain.id,
-                                         :name => dns_ns_record,
-                                         :type =>'A', :ttl => TTL_4H,
-                                         :content => Config.dns['address'])
+      binder = DeploymentPlan::DnsBinder.new(@deployment_plan)
+      binder.bind_deployment
     end
 
     def bind_instance_vms
-      unbound_instances = []
-
-      @deployment_plan.jobs.each do |job|
-        job.instances.each do |instance|
-          # Don't allocate resource pool VMs to instances in detached state
-          next if instance.state == 'detached'
-          # Skip bound instances
-          next if instance.model.vm
-          unbound_instances << instance
-        end
-      end
+      jobs = @deployment_plan.jobs_starting_on_deploy
+      instances = jobs.map(&:instances).flatten
 
-      return if unbound_instances.empty?
-
-      @event_log.begin_stage('Binding instance VMs', unbound_instances.size)
-
-      ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-        unbound_instances.each do |instance|
-          pool.process do
-            bind_instance_vm(instance)
-          end
-        end
-      end
-    end
-
-    # @param [DeploymentPlan::Instance]
-    def bind_instance_vm(instance)
-      @event_log.track("#{instance.job.name}/#{instance.index}") do
-        idle_vm = instance.idle_vm
-
-        # Apply the assignment to the VM
-        agent = AgentClient.with_defaults(idle_vm.vm.agent_id)
-        state = idle_vm.current_state
-        state['job'] = instance.job.spec
-        state['index'] = instance.index
-        agent.apply(state)
-
-        # Our assumption here is that director database access
-        # is much less likely to fail than VM agent communication
-        # so we only update database after we see a successful agent apply.
-        # If database update fails subsequent deploy will try to
-        # assign a new VM to this instance which is ok.
-        idle_vm.vm.db.transaction do
-          idle_vm.vm.update(:apply_spec => state)
-          instance.model.update(:vm => idle_vm.vm)
-        end
-        instance.current_state = state
-      end
+      binder = DeploymentPlan::InstanceVmBinder.new(@event_log)
+      binder.bind_instance_vms(instances)
     end
 
     def delete_unneeded_vms

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

@@ -0,0 +1,45 @@
+module Bosh::Director
+  class DeploymentPlan::DnsBinder
+    include DnsHelper
+
+    def initialize(deployment)
+      @deployment = deployment
+      @config = Config
+    end
+
+    def bind_deployment
+      return unless @config.dns_enabled?
+
+      domain = Models::Dns::Domain.find_or_create(
+        :name => dns_domain_name,
+        :type => 'NATIVE',
+      )
+      @deployment.dns_domain = domain
+
+      soa_record = Models::Dns::Record.find_or_create(
+        :domain_id => domain.id,
+        :name => dns_domain_name,
+        :type => 'SOA',
+      )
+      soa_record.content = SOA
+      soa_record.ttl = 300
+      soa_record.save
+
+      # add NS record
+      Models::Dns::Record.find_or_create(
+        :domain_id => domain.id,
+        :name => dns_domain_name,
+        :type =>'NS', :ttl => TTL_4H,
+        :content => dns_ns_record,
+      )
+
+      # add A record for name server
+      Models::Dns::Record.find_or_create(
+        :domain_id => domain.id,
+        :name => dns_ns_record,
+        :type =>'A', :ttl => TTL_4H,
+        :content => @config.dns['address'],
+      )
+    end
+  end
+end

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

@@ -162,7 +162,18 @@ module Bosh::Director
         @network_reservations.each do |name, reservation|
           network = @job.deployment.network(name)
           network_settings[name] = network.network_settings(reservation, default_properties[name])
-          network_settings[name]['dns_record_name'] = dns_record_name(name)
+
+          # Temporary hack for running errands.
+          # We need to avoid RunErrand task thinking that
+          # network configuration for errand VM differs
+          # from network configuration for its Instance.
+          #
+          # Obviously this does not account for other changes
+          # in network configuration that errand job might need.
+          # (e.g. errand job desires static ip)
+          if @job.starts_on_deploy?
+            network_settings[name]['dns_record_name'] = dns_record_name(name)
+          end
 
           # Somewhat of a hack: for dynamic networks we might know IP address, Netmask & Gateway
           # if they're featured in agent state, in that case we put them into network spec to satisfy

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

@@ -0,0 +1,58 @@
+module Bosh::Director
+  class DeploymentPlan::InstanceVmBinder
+    def initialize(event_log)
+      @event_log = event_log
+    end
+
+    # @param [Array<DeploymentPlan::Instance>]
+    #   instances All instances to consider for binding to a VM
+    def bind_instance_vms(instances)
+      unbound_instances = []
+
+      instances.each do |instance|
+        # Don't allocate resource pool VMs to instances in detached state
+        next if instance.state == 'detached'
+
+        # Skip bound instances
+        next if instance.model.vm
+
+        unbound_instances << instance
+      end
+
+      return if unbound_instances.empty?
+
+      @event_log.begin_stage('Binding instance VMs', unbound_instances.size)
+
+      ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
+        unbound_instances.each do |instance|
+          pool.process { bind_instance_vm(instance) }
+        end
+      end
+    end
+
+    # @param [DeploymentPlan::Instance] instance
+    def bind_instance_vm(instance)
+      @event_log.track("#{instance.job.name}/#{instance.index}") do
+        idle_vm = instance.idle_vm
+
+        # Apply the assignment to the VM
+        agent = AgentClient.with_defaults(idle_vm.vm.agent_id)
+        state = idle_vm.current_state
+        state['job'] = instance.job.spec
+        state['index'] = instance.index
+        agent.apply(state)
+
+        # Our assumption here is that director database access
+        # is much less likely to fail than VM agent communication
+        # so we only update database after we see a successful agent apply.
+        # If database update fails subsequent deploy will try to
+        # assign a new VM to this instance which is ok.
+        idle_vm.vm.db.transaction do
+          idle_vm.vm.update(:apply_spec => state)
+          instance.model.update(:vm => idle_vm.vm)
+        end
+        instance.current_state = state
+      end
+    end
+  end
+end

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

@@ -5,6 +5,9 @@ module Bosh::Director
     class Job
       include Bosh::Common::PropertyHelper
 
+      VALID_LIFECYCLE_PROFILES = %w(service errand)
+      DEFAULT_LIFECYCLE_PROFILE = 'service'
+
       # started, stopped and detached are real states
       # (persisting in DB and reflecting target instance state)
       # recreate and restart are two virtual states
@@ -15,6 +18,9 @@ module Bosh::Director
       # @return [String] Job name
       attr_accessor :name
 
+      # @return [String] Lifecycle profile
+      attr_accessor :lifecycle
+
       # @return [String] Job canonical name (mostly for DNS)
       attr_accessor :canonical_name
 
@@ -229,6 +235,35 @@ module Bosh::Director
         end
       end
 
+      def bind_unallocated_vms
+        instances.each do |instance|
+          instance.bind_unallocated_vm
+
+          # Now that we know every VM has been allocated and
+          # instance models are bound, we can sync the state.
+          instance.sync_state_with_db
+        end
+      end
+
+      def bind_instance_networks
+        instances.each do |instance|
+          instance.network_reservations.each do |net_name, reservation|
+            unless reservation.reserved?
+              network = @deployment.network(net_name)
+              network.reserve!(reservation, "`#{name}/#{instance.index}'")
+            end
+          end
+        end
+      end
+
+      def starts_on_deploy?
+        @lifecycle == 'service'
+      end
+
+      def can_run_as_errand?
+        @lifecycle == 'errand'
+      end
+
       private
 
       # @param [Hash] collection All properties collection

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

@@ -21,6 +21,8 @@ module Bosh::Director
         @job = Job.new(@deployment)
 
         parse_name
+        parse_lifecycle
+
         parse_release
         parse_template
         parse_templates
@@ -45,6 +47,22 @@ module Bosh::Director
         @job.canonical_name = canonical(@job.name)
       end
 
+      def parse_lifecycle
+        lifecycle = safe_property(@job_spec, "lifecycle",
+          :class => String,
+          :optional => true,
+          :default => Job::DEFAULT_LIFECYCLE_PROFILE,
+        )
+
+        unless Job::VALID_LIFECYCLE_PROFILES.include?(lifecycle)
+          raise JobInvalidLifecycle,
+            "Invalid lifecycle `#{lifecycle}' for `#{@job.name}', " +
+            "valid lifecycle profiles are: #{Job::VALID_LIFECYCLE_PROFILES.join(', ')}"
+        end
+
+        @job.lifecycle = lifecycle
+      end
+
       def parse_release
         release_name = safe_property(@job_spec, "release", :class => String, :optional => true)
 

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

@@ -227,6 +227,10 @@ module Bosh::Director
         @jobs_name_index[name]
       end
 
+      def jobs_starting_on_deploy
+        @jobs.select(&:starts_on_deploy?)
+      end
+
       def rename_in_progress?
         @job_rename['old_name'] && @job_rename['new_name']
       end

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

@@ -1,12 +1,14 @@
 module Bosh::Director
   module DeploymentPlan
     class Preparer
-      def initialize(job, compiler)
+      def initialize(job, assembler)
         @job = job
-        @assembler = compiler
+        @assembler = assembler
       end
 
       def prepare
+        job.begin_stage('Preparing deployment', 9)
+
         job.track_and_log('Binding deployment') do
           @assembler.bind_deployment
         end

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

@@ -14,9 +14,7 @@ module Bosh::Director
       def update
         @event_log.begin_stage('Preparing DNS', 1)
         @base_job.track_and_log('Binding DNS') do
-          if Config.dns_enabled?
-            @assembler.bind_dns
-          end
+          @assembler.bind_dns
         end
 
         @logger.info('Updating resource pools')
@@ -38,7 +36,11 @@ module Bosh::Director
         @assembler.delete_unneeded_instances
 
         @logger.info('Updating jobs')
-        @multi_job_updater.run(@base_job, @deployment_plan, @deployment_plan.jobs)
+        @multi_job_updater.run(
+          @base_job,
+          @deployment_plan,
+          @deployment_plan.jobs_starting_on_deploy,
+        )
 
         @logger.info('Refilling resource pools')
         @resource_pools.refill

data/lib/bosh/director/errand.rb

@@ -0,0 +1,7 @@
+module Bosh::Director
+  module Errand; end
+end
+
+require 'bosh/director/errand/deployment_preparer'
+require 'bosh/director/errand/job_manager'
+require 'bosh/director/errand/runner'

data/lib/bosh/director/errand/deployment_preparer.rb

@@ -0,0 +1,29 @@
+module Bosh::Director
+  class Errand::DeploymentPreparer
+    # @param [Bosh::Director::DeploymentPlan::Planner] deployment
+    # @param [Bosh::Director::DeploymentPlan::Job] job
+    # @param [Bosh::Director::EventLog::Log] event_log
+    # @param [Bosh::Blobstore::Jobs::BaseJob] base_job
+    def initialize(deployment, job, event_log, base_job)
+      @deployment = deployment
+      @job = job
+      @event_log = event_log
+      @base_job = base_job
+    end
+
+    def prepare_deployment
+      assembler = DeploymentPlan::Assembler.new(@deployment)
+
+      preparer = DeploymentPlan::Preparer.new(@base_job, assembler)
+      preparer.prepare
+
+      compiler = PackageCompiler.new(@deployment)
+      compiler.compile
+    end
+
+    def prepare_job
+      @job.bind_unallocated_vms
+      @job.bind_instance_networks
+    end
+  end
+end

data/lib/bosh/director/errand/job_manager.rb

@@ -0,0 +1,41 @@
+module Bosh::Director
+  class Errand::JobManager
+    # @param [Bosh::Director::DeploymentPlan::Planner] deployment
+    # @param [Bosh::Director::DeploymentPlan::Job] job
+    # @param [Bosh::Blobstore::Client] blobstore
+    # @param [Bosh::Director::EventLog::Log] event_log
+    def initialize(deployment, job, blobstore, event_log)
+      @deployment = deployment
+      @job = job
+      @blobstore = blobstore
+      @event_log = event_log
+    end
+
+    # Creates/updates all job instances
+    # @return [void]
+    def update_instances
+      dns_binder = DeploymentPlan::DnsBinder.new(@deployment)
+      dns_binder.bind_deployment
+
+      instance_vm_binder = DeploymentPlan::InstanceVmBinder.new(@event_log)
+      instance_vm_binder.bind_instance_vms(@job.instances)
+
+      job_renderer = JobRenderer.new(@job)
+      job_renderer.render_job_instances(@blobstore)
+
+      job_updater = JobUpdater.new(@deployment, @job)
+      job_updater.update
+    end
+
+    # Deletes created all job instances
+    # @return [void]
+    def delete_instances
+      event_log_stage = @event_log.begin_stage(
+        'Deleting instances', @job.instances.size, [@job.name])
+
+      instance_deleter = InstanceDeleter.new(@deployment)
+      instance_deleter.delete_instances(
+        @job.instances.map(&:model), event_log_stage)
+    end
+  end
+end

data/lib/bosh/director/errand/runner.rb

@@ -0,0 +1,79 @@
+require 'membrane'
+
+module Bosh::Director
+  class Errand::Runner
+    class ErrandResult
+      attr_reader :exit_code
+
+      AGENT_TASK_RESULT_SCHEMA = ::Membrane::SchemaParser.parse do
+        {
+          'exit_code' => Integer,
+          'stdout' => String,
+          'stderr' => String,
+        }
+      end
+
+      # Explicitly write out schema of the director task result
+      # to avoid accidently leaking agent task result extra fields.
+      def self.from_agent_task_result(agent_task_result)
+        AGENT_TASK_RESULT_SCHEMA.validate(agent_task_result)
+        new(*agent_task_result.values_at('exit_code', 'stdout', 'stderr'))
+      rescue Membrane::SchemaValidationError => e
+        raise AgentInvalidTaskResult, e.message
+      end
+
+      def initialize(exit_code, stdout, stderr)
+        @exit_code = exit_code
+        @stdout = stdout
+        @stderr = stderr
+      end
+
+      def to_hash
+        {
+          'exit_code' => @exit_code,
+          'stdout' => @stdout,
+          'stderr' => @stderr,
+        }
+      end
+    end
+
+    # @param [Bosh::Director::DeploymentPlan::Job] job
+    # @param [Bosh::Director::TaskResultFile] result_file
+    # @param [Bosh::Director::EventLog::Log] event_log
+    def initialize(job, result_file, instance_manager, event_log)
+      @job = job
+      @result_file = result_file
+      @instance_manager = instance_manager
+      @event_log = event_log
+    end
+
+    # Runs errand on job instances
+    # @return [String] short description of the errand result
+    def run
+      instance = @job.instances.first
+      unless instance
+        raise DirectorError, 'Must have at least one job instance to run an errand'
+      end
+
+      agent_task_result = nil
+
+      event_log_stage = @event_log.begin_stage('Running errand', 1)
+      event_log_stage.advance_and_track("#{@job.name}/#{instance.index}") do
+        agent = @instance_manager.agent_client_for(instance.model)
+        agent_task_result = agent.run_errand
+      end
+
+      errand_result = ErrandResult.from_agent_task_result(agent_task_result)
+      @result_file.write(JSON.dump(errand_result.to_hash) + "\n")
+
+      title_prefix = "Errand `#{@job.name}' completed"
+      exit_code_suffix = "(exit code #{errand_result.exit_code})"
+
+      if errand_result.exit_code == 0
+        "#{title_prefix} successfully #{exit_code_suffix}"
+      else
+        "#{title_prefix} with error #{exit_code_suffix}"
+      end
+    end
+  end
+end

data/lib/bosh/director/errors.rb

@@ -54,6 +54,7 @@ module Bosh::Director
   TaskNotFound = err(10000, NOT_FOUND)
   TaskCancelled = err(10001, OK)
 
+  # User management
   UserNotFound = err(20000, NOT_FOUND)
   UserImmutableUsername = err(20001)
   UserInvalid = err(20002)
@@ -83,6 +84,7 @@ module Bosh::Director
 
   PackageInvalidArchive = err(60000)
 
+  # Models
   DeploymentNotFound = err(70000, NOT_FOUND)
   InstanceNotFound = err(70001, NOT_FOUND)
   InstanceInvalidIndex = err(70002)
@@ -93,7 +95,9 @@ module Bosh::Director
   VmInstanceOutOfSync = err(70006)
   InstanceTargetStateUndefined = err(70007)
   SnapshotNotFound = err(70008)
+  JobNotFound = err(70009, NOT_FOUND)
 
+  # Extracting job from a release
   JobInvalidArchive = err(80000)
   JobMissingManifest = err(80001)
   JobMissingTemplateFile = err(80002)
@@ -110,12 +114,14 @@ module Bosh::Director
   ResourceError = err(100001)
   ResourceNotFound = err(100002, NOT_FOUND)
 
+  # Director property management
   PropertyAlreadyExists = err(110001)
   PropertyInvalid = err(110002)
   PropertyNotFound = err(110003, NOT_FOUND)
 
   CompilationConfigUnknownNetwork = err(120001)
 
+  # Manifest parsing: network section
   NetworkReservationInvalidIp = err(130001)
   NetworkReservationMissing = err(130002)
   NetworkReservationAlreadyExists = err(130003)
@@ -128,6 +134,7 @@ module Bosh::Director
   NetworkReservationError = err(130010)
   NetworkReservationNotEnoughCapacity = err(130010)
 
+  # Manifest parsing: job section
   JobMissingRelease = err(140001)
   JobUnknownRelease = err(140002)
   JobUnknownResourcePool = err(140003)
@@ -136,7 +143,9 @@ module Bosh::Director
   JobInvalidJobState = err(140006)
   JobMissingNetwork = err(140007)
   JobInvalidTemplates = err(140008)
+  JobInvalidLifecycle = err(140009)
 
+  # Manifest parsing: job networks section
   JobUnknownNetwork = err(150001)
   JobNetworkInstanceIpMismatch = err(150002)
   JobNetworkInvalidDefault = err(150003)
@@ -170,6 +179,7 @@ module Bosh::Director
   CloudDiskMissing = err(390002)
   CloudNotEnoughDiskSpace = err(390003)
 
+  # Agent errors
   AgentTaskNoBlobstoreId = err(400001)
   AgentInvalidStateFormat = err(400002)
   AgentWrongDeployment = err(400003)
@@ -182,6 +192,7 @@ module Bosh::Director
   AgentDiskOutOfSync = err(400010)
   AgentInvalidTaskResult = err(400011)
 
+  # Cloud check task errors
   CloudcheckTooManySimilarProblems = err(410001)
   CloudcheckResolutionNotProvided = err(410002)
   CloudcheckInvalidResolutionFormat = err(410003)
@@ -198,4 +209,7 @@ module Bosh::Director
 
   SystemError = err(500000, INTERNAL_SERVER_ERROR)
   NotEnoughDiskSpace = err(500001, INTERNAL_SERVER_ERROR)
+
+  # Run errand errors
+  RunErrandError = err(510000)
 end

data/lib/bosh/director/jobs/run_errand.rb

@@ -1,73 +1,95 @@
-require 'membrane'
+require 'psych'
 
 module Bosh::Director
-  module Jobs
-    class RunErrand < BaseJob
-      @queue = :normal
-
-      class ErrandResult
-        attr_reader :exit_code
-
-        AGENT_TASK_RESULT_SCHEMA = ::Membrane::SchemaParser.parse do
-          {
-            'exit_code' => Integer,
-            'stdout' => String,
-            'stderr' => String,
-          }
-        end
-
-        # Explicitly write out schema of the director task result
-        # to avoid accidently leaking agent task result extra fields.
-        def self.from_agent_task_result(agent_task_result)
-          AGENT_TASK_RESULT_SCHEMA.validate(agent_task_result)
-          new(*agent_task_result.values_at('exit_code', 'stdout', 'stderr'))
-        rescue Membrane::SchemaValidationError => e
-          raise AgentInvalidTaskResult, e.message
-        end
-
-        def initialize(exit_code, stdout, stderr)
-          @exit_code = exit_code
-          @stdout = stdout
-          @stderr = stderr
-        end
-
-        def to_hash
-          {
-            'exit_code' => @exit_code,
-            'stdout' => @stdout,
-            'stderr' => @stderr,
-          }
-        end
+  class Jobs::RunErrand < Jobs::BaseJob
+    @queue = :normal
+
+    def self.job_type
+      :run_errand
+    end
+
+    def initialize(deployment_name, errand_name)
+      @deployment_name = deployment_name
+      @errand_name = errand_name
+      @deployment_manager = Api::DeploymentManager.new
+      @instance_manager = Api::InstanceManager.new
+      @blobstore = App.instance.blobstores.blobstore
+    end
+
+    def perform
+      deployment_model = @deployment_manager.find_by_name(@deployment_name)
+
+      manifest = Psych.load(deployment_model.manifest)
+      deployment = DeploymentPlan::Planner.parse(manifest, event_log, {})
+
+      job = deployment.job(@errand_name)
+      if job.nil?
+        raise JobNotFound, "Errand `#{@errand_name}' doesn't exist"
+      end
+
+      unless job.can_run_as_errand?
+        raise RunErrandError,
+              "Job `#{job.name}' is not an errand. To mark a job as an errand " +
+              "set its lifecycle to 'errand' in the deployment manifest."
       end
 
-      def self.job_type
-        :run_errand
+      if job.instances.empty?
+        raise InstanceNotFound, "Instance `#{@deployment_name}/#{@errand_name}/0' doesn't exist"
       end
 
-      def initialize(deployment_name, errand_name)
-        @deployment_name = deployment_name
-        @errand_name = errand_name
-        @instance_manager = Api::InstanceManager.new
+      runner = Errand::Runner.new(job, result_file, @instance_manager, event_log)
+
+      with_updated_instances(deployment, job) do
+        logger.info('Starting to run errand')
+        runner.run
       end
+    end
 
-      def perform
-        instance = @instance_manager.find_by_name(@deployment_name, @errand_name, 0)
+    private
 
-        agent = @instance_manager.agent_client_for(instance)
-        agent_task_result = agent.run_errand
+    def with_updated_instances(deployment, job, &blk)
+      logger.info('Starting to prepare for deployment')
+      prepare_deployment(deployment, job)
 
-        errand_result = ErrandResult.from_agent_task_result(agent_task_result)
-        result_file.write(JSON.dump(errand_result.to_hash) + "\n")
+      logger.info('Starting to update resource pool')
+      rp_manager = update_resource_pool(job)
 
-        title_prefix = "Errand `#{@errand_name}' completed"
-        exit_code_suffix = "(exit code #{errand_result.exit_code})"
+      logger.info('Starting to update job instances')
+      job_manager = update_instances(deployment, job)
 
-        if errand_result.exit_code == 0
-          "#{title_prefix} successfully #{exit_code_suffix}"
-        else
-          "#{title_prefix} with error #{exit_code_suffix}"
-        end
-      end
+      result = blk.call
+
+      logger.info('Starting to delete job instances')
+      job_manager.delete_instances
+
+      logger.info('Starting to refill resource pool')
+      rp_manager.refill
+
+      result
+    end
+
+    def prepare_deployment(deployment, job)
+      deployment_preparer = Errand::DeploymentPreparer.new(
+        deployment, job, event_log, self)
+
+      deployment_preparer.prepare_deployment
+      deployment_preparer.prepare_job
+    end
+
+    def update_resource_pool(job)
+      rp_updaters = [ResourcePoolUpdater.new(job.resource_pool)]
+      rp_manager = DeploymentPlan::ResourcePools.new(event_log, rp_updaters)
+
+      rp_manager.update
+      rp_manager
+    end
+
+    def update_instances(deployment, job)
+      job_manager = Errand::JobManager.new(
+        deployment, job, @blobstore, event_log)
+
+      job_manager.update_instances
+      job_manager
     end
   end
 end

data/lib/bosh/director/jobs/update_deployment.rb

@@ -39,8 +39,6 @@ module Bosh::Director
       def prepare
         @assembler = DeploymentPlan::Assembler.new(@deployment_plan)
         preparer = DeploymentPlan::Preparer.new(self, @assembler)
-
-        begin_stage('Preparing deployment', 9)
         preparer.prepare
 
         logger.info('Compiling and binding packages')

data/lib/bosh/director/task_result_file.rb

@@ -1,10 +1,7 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
-
   class TaskResultFile
     def initialize(file_name)
-      @file = File.open(file_name, "w")
+      @file = File.open(file_name, 'w')
       @lock = Mutex.new
     end
 
@@ -16,4 +13,3 @@ module Bosh::Director
     end
   end
 end
-

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2168.0'
+    VERSION = '1.2175.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2168.0
+  version: 1.2175.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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.2168.0
+        version: 1.2175.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2168.0
+        version: 1.2175.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
 
-  542f8e'
+  83a657'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -602,9 +602,11 @@ files:
 - lib/bosh/director/deployment_plan/compilation_config.rb
 - lib/bosh/director/deployment_plan/compiled_package.rb
 - lib/bosh/director/deployment_plan/deployment_spec_parser.rb
+- lib/bosh/director/deployment_plan/dns_binder.rb
 - lib/bosh/director/deployment_plan/dynamic_network.rb
 - lib/bosh/director/deployment_plan/idle_vm.rb
 - lib/bosh/director/deployment_plan/instance.rb
+- lib/bosh/director/deployment_plan/instance_vm_binder.rb
 - lib/bosh/director/deployment_plan/job.rb
 - lib/bosh/director/deployment_plan/job_spec_parser.rb
 - lib/bosh/director/deployment_plan/manual_network.rb
@@ -625,6 +627,10 @@ files:
 - lib/bosh/director/download_helper.rb
 - lib/bosh/director/duration.rb
 - lib/bosh/director/encryption_helper.rb
+- lib/bosh/director/errand.rb
+- lib/bosh/director/errand/deployment_preparer.rb
+- lib/bosh/director/errand/job_manager.rb
+- lib/bosh/director/errand/runner.rb
 - lib/bosh/director/errors.rb
 - lib/bosh/director/event_log.rb
 - lib/bosh/director/ext.rb
@@ -741,7 +747,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4485791993473408680
+      hash: -1777045952966921306
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23