bosh-director 1.5.0.pre.1623 → 1.5.0.pre.1633

data/lib/bosh/director/compile_task.rb

@@ -25,7 +25,6 @@ module Bosh::Director
     # @return [String] A unique checksum based on the dependencies in this task
     attr_reader :cache_key
 
-
     def initialize(package, stemcell, initial_job, dependency_key, cache_key)
       @package = package
       @stemcell = stemcell

data/lib/bosh/director/config.rb

@@ -80,7 +80,7 @@ module Bosh::Director
 
         # Event logger supposed to be overridden per task,
         # the default one does nothing
-        @event_log = EventLog.new
+        @event_log = EventLog::Log.new
 
         # by default keep only last 500 tasks in disk
         @max_tasks = config.fetch("max_tasks", 500).to_i

data/lib/bosh/director/deployment_plan.rb

@@ -13,6 +13,7 @@ require 'bosh/director/deployment_plan/compiled_package'
 require 'bosh/director/deployment_plan/rendered_templates_archive'
 require 'bosh/director/deployment_plan/preparer'
 require 'bosh/director/deployment_plan/resource_pools'
+require 'bosh/director/deployment_plan/multi_job_updater'
 require 'bosh/director/deployment_plan/updater'
 require 'bosh/director/deployment_plan/release_version'
 require 'bosh/director/deployment_plan/resource_pool'

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 require 'common/deep_copy'
 
 module Bosh::Director

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

@@ -0,0 +1,65 @@
+module Bosh::Director
+  module DeploymentPlan
+    class SerialMultiJobUpdater
+      def run(base_job, deployment_plan, jobs)
+        base_job.logger.info("Updating jobs serially: #{jobs.map(&:name).join(', ')}")
+
+        jobs.each do |j|
+          base_job.task_checkpoint
+          base_job.logger.info("Updating job: #{j.name}")
+          job_updater = JobUpdater.new(deployment_plan, j)
+          job_updater.update
+        end
+      end
+    end
+
+    class ParallelMultiJobUpdater
+      def run(base_job, deployment_plan, jobs)
+        base_job.logger.info("Updating jobs in parallel: #{jobs.map(&:name).join(', ')}")
+        base_job.task_checkpoint
+
+        ThreadPool.new(max_threads: jobs.size).wrap do |pool|
+          jobs.each do |j|
+            pool.process do
+              base_job.logger.info("Updating job: #{j.name}")
+              job_updater = JobUpdater.new(deployment_plan, j)
+              job_updater.update
+            end
+          end
+        end
+      end
+    end
+
+    class BatchMultiJobUpdater
+      def run(base_job, deployment_plan, jobs)
+        serial_updater = SerialMultiJobUpdater.new
+        parallel_updater = ParallelMultiJobUpdater.new
+
+        partition_jobs_by_serial(jobs).each do |jp|
+          updater = jp.first.update.serial? ? serial_updater : parallel_updater
+          updater.run(base_job, deployment_plan, jp)
+        end
+      end
+
+      private
+
+      def partition_jobs_by_serial(jobs)
+        job_partitions = []
+        last_partition = []
+
+        jobs.each do |j|
+          lastj = last_partition.last
+          if !lastj || lastj.update.serial? == j.update.serial?
+            last_partition << j
+          else
+            job_partitions << last_partition
+            last_partition = [j]
+          end
+        end
+
+        job_partitions << last_partition if last_partition.any?
+        job_partitions
+      end
+    end
+  end
+end

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

@@ -43,6 +43,12 @@ module Bosh::Director
             parse_watch_times(update_watch_times)
         end
 
+        @serial = safe_property(update_config, "serial", {
+          class: :boolean,
+          optional: true,
+          default: default_update_config ? default_update_config.serial? : true,
+        })
+
         if optional
           @canaries ||= default_update_config.canaries
 
@@ -75,6 +81,10 @@ module Bosh::Director
 
         result
       end
+
+      def serial?
+        !!@serial
+      end
     end
   end
-end
+end

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

@@ -1,55 +1,48 @@
 module Bosh::Director
   module DeploymentPlan
     class Updater
-      def initialize(job, event_log, resource_pools, assembler, deployment_plan)
-        @job = job
-        @logger = job.logger
+      def initialize(base_job, event_log, resource_pools, assembler, deployment_plan, multi_job_updater)
+        @base_job = base_job
+        @logger = base_job.logger
         @event_log = event_log
         @resource_pools = resource_pools
         @assembler = assembler
         @deployment_plan = deployment_plan
+        @multi_job_updater = multi_job_updater
       end
 
       def update
-        event_log.begin_stage('Preparing DNS', 1)
-        job.track_and_log('Binding DNS') do
+        @event_log.begin_stage('Preparing DNS', 1)
+        @base_job.track_and_log('Binding DNS') do
           if Config.dns_enabled?
-            assembler.bind_dns
+            @assembler.bind_dns
           end
         end
 
-        logger.info('Updating resource pools')
-        resource_pools.update
-        job.task_checkpoint
+        @logger.info('Updating resource pools')
+        @resource_pools.update
+        @base_job.task_checkpoint
 
-        logger.info('Binding instance VMs')
-        assembler.bind_instance_vms
+        @logger.info('Binding instance VMs')
+        @assembler.bind_instance_vms
 
-        event_log.begin_stage('Preparing configuration', 1)
-        job.track_and_log('Binding configuration') do
-          assembler.bind_configuration
+        @event_log.begin_stage('Preparing configuration', 1)
+        @base_job.track_and_log('Binding configuration') do
+          @assembler.bind_configuration
         end
 
-        logger.info('Deleting no longer needed VMs')
-        assembler.delete_unneeded_vms
+        @logger.info('Deleting no longer needed VMs')
+        @assembler.delete_unneeded_vms
 
-        logger.info('Deleting no longer needed instances')
-        assembler.delete_unneeded_instances
+        @logger.info('Deleting no longer needed instances')
+        @assembler.delete_unneeded_instances
 
-        logger.info('Updating jobs')
-        deployment_plan.jobs.each do |bosh_job|
-          job.task_checkpoint
-          logger.info("Updating job: #{bosh_job.name}")
-          JobUpdater.new(deployment_plan, bosh_job).update
-        end
+        @logger.info('Updating jobs')
+        @multi_job_updater.run(@base_job, @deployment_plan, @deployment_plan.jobs)
 
-        logger.info('Refilling resource pools')
-        resource_pools.refill
+        @logger.info('Refilling resource pools')
+        @resource_pools.refill
       end
-
-      private
-
-      attr_reader :job, :event_log, :resource_pools, :logger, :assembler, :deployment_plan
     end
   end
 end

data/lib/bosh/director/event_log.rb

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
-  class EventLog
-
+  module EventLog
     # Event log conventions:
     # All event log entries having same "stage" logically belong to the same
     # event group. "tags" is an array of strings that supposed to act as hint
@@ -25,112 +22,127 @@ module Bosh::Director
     # Job update (mysql_node):
     # update |--------        | (2/4) 50%
 
-    attr_reader :stage
-    attr_reader :total
-    attr_reader :counter
-
-    def initialize(io = nil)
-      @logger = EventLogger.new(io || StringIO.new)
-      @lock = Mutex.new
-      @counter = 0
-    end
+    class Log
+      def initialize(io = nil)
+        @logger = CustomLogger.new(io || StringIO.new)
+        @last_stage = Stage.new(self, 'unknown', [], 0)
+        @last_stage_lock = Mutex.new
+      end
 
-    def begin_stage(stage, total = nil, tags = [])
-      @lock.synchronize do
-        @stage = stage
-        @tags = tags
-        @counter = 0
-        @total = total
+      def begin_stage(stage_name, total = nil, tags = [])
+        stage = Stage.new(self, stage_name, tags, total)
+        @last_stage_lock.synchronize { @last_stage = stage }
       end
-    end
 
-    def track(task = nil)
-      index = nil
-      @lock.synchronize do
-        @counter += 1
-        index = @counter
+      def track(task_name = nil, &blk)
+        last_stage = @last_stage_lock.synchronize { @last_stage }
+        last_stage.advance_and_track(task_name, &blk)
       end
 
-      ticker = EventTicker.new(self, task, index)
+      # Adds an error entry to the event log.
+      # @param [DirectorError] error Director error
+      # @return [void]
+      def log_error(error)
+        @logger.info(Yajl::Encoder.encode(
+          :time => Time.now.to_i,
+          :error => {
+            :code => error.error_code,
+            :message => error.message,
+          },
+        ))
+      end
 
-      start_task(task, index)
-      begin
-        yield ticker if block_given?
-      rescue => e
-        task_failed(task, index, 100, e.to_s)
-        raise
+      def log_entry(entry)
+        @logger.info(Yajl::Encoder.encode(entry))
       end
-      finish_task(task, index)
     end
 
-    # Adds an error entry to the event log.
-    # @param [DirectorError] error Director error
-    # @return [void]
-    def log_error(error)
-      entry = {
-        :time => Time.now.to_i,
-        :error => {
-          :code => error.error_code,
-          :message => error.message
-        }
-      }
+    class Stage
+      def initialize(event_log, name, tags, total)
+        @event_log = event_log
+        @name = name
+        @tags = tags
+        @index = 0
+        @total = total
+        @index_lock = Mutex.new
+      end
 
-      @logger.info(Yajl::Encoder.encode(entry))
-    end
+      def advance_and_track(task_name, &blk)
+        task = @index_lock.synchronize do
+          @index += 1
+          Task.new(self, task_name, @index)
+        end
+
+        task.start
+        begin
+          blk.call(task) if blk
+        rescue => e
+          task.failed(e.to_s)
+          raise
+        end
+        task.finish
+      end
 
-    def start_task(task, index, progress = 0)
-      log_task(task, "started", index, progress)
+      def log_entry(entry)
+        @event_log.log_entry({
+          :time => Time.now.to_i,
+          :stage => @name,
+          :tags => @tags,
+          :total => @total,
+        }.merge(entry))
+      end
     end
 
-    def finish_task(task, index, progress = 100)
-      log_task(task, "finished", index, progress)
-    end
+    class Task
+      def initialize(stage, name, index)
+        @stage = stage
+        @name = name
+        @index = index
+        @state = 'in_progress'
+        @progress = 0
+      end
 
-    def task_failed(task, index, progress = 100, error = nil)
-      log_task(task, "failed", index, progress, {"error" => error})
-    end
+      def advance(delta, data = {})
+        @state = 'in_progress'
+        @progress = [@progress + delta, 100].min
+        log_entry(data)
+      end
 
-    def log_task(task, state, index, progress = 0, data = {})
-      entry = {
-        :time => Time.now.to_i,
-        :stage => @stage,
-        :task => task,
-        :tags => @tags,
-        :index => index,
-        :total => @total,
-        :state => state,
-        :progress => progress,
-      }
-
-      if data.size > 0
-        entry[:data] = data
+      def start
+        @state = 'started'
+        log_entry
       end
 
-      @logger.info(Yajl::Encoder.encode(entry))
-    end
+      def finish
+        @state = 'finished'
+        @progress = 100
+        log_entry
+      end
 
-  end
+      def failed(error_msg = nil)
+        @state = 'failed'
+        @progress = 100
+        log_entry("error" => error_msg)
+      end
 
-  class EventLogger < Logger
-    def format_message(level, time, progname, msg)
-      msg + "\n"
-    end
-  end
+      private
 
-  # Sometimes task needs to be split into subtasks so we can track its progress
-  # with more granularity. In that case we can use EventTicker helper class
-  # to advance progress between N and N+1 by small increments.
-  class EventTicker
-    def initialize(event_log, task, index)
-      @event_log = event_log
-      @task = task
-      @index = index
-      @progress = 0
+      def log_entry(data = {})
+        task_entry = {
+          :task => @name,
+          :index => @index,
+          :state => @state,
+          :progress => @progress.to_i,
+        }
+        task_entry[:data] = data if data.size > 0
+        @stage.log_entry(task_entry)
+      end
     end
 
-    def advance(delta, data = {})
-      @progress = [@progress + delta, 100].min
-      @event_log.log_task(@task, "in_progress", @index, @progress.to_i, data)
+    class CustomLogger < ::Logger
+      def format_message(level, time, progname, msg)
+        msg + "\n"
+      end
     end
   end
 end

data/lib/bosh/director/instance_deleter.rb

@@ -7,7 +7,6 @@ module Bosh::Director
       @deployment_plan = deployment_plan
       @cloud = Config.cloud
       @logger = Config.logger
-      @event_log = Config.event_log
       @blobstore = App.instance.blobstores.blobstore
     end
 
@@ -15,11 +14,11 @@ module Bosh::Director
     # @param [Array<Models::Instance>] instances list of instances to delete
     # @param [Hash] options optional list of options controlling concurrency
     # @return [void]
-    def delete_instances(instances, options = {})
+    def delete_instances(instances, event_log_stage, options = {})
       max_threads = options[:max_threads] || Config.max_threads
       ThreadPool.new(:max_threads => max_threads).wrap do |pool|
         instances.each do |instance|
-          pool.process { delete_instance(instance) }
+          pool.process { delete_instance(instance, event_log_stage) }
         end
       end
     end
@@ -27,11 +26,11 @@ module Bosh::Director
     # Deletes a single instance and attached persistent disks
     # @param [Models::Instance] instance instance to delete
     # @return [void]
-    def delete_instance(instance)
+    def delete_instance(instance, event_log_stage)
       vm = instance.vm
-      @event_log.track(vm.cid) do
-        @logger.info("Delete unneeded instance: #{vm.cid}")
+      @logger.info("Delete unneeded instance: #{vm.cid}")
 
+      event_log_stage.advance_and_track(vm.cid) do
         drain(vm.agent_id)
         @cloud.delete_vm(vm.cid)
         delete_snapshots(instance)
@@ -105,6 +104,5 @@ module Bosh::Director
         delete_dns_records(record_pattern, @deployment_plan.dns_domain.id)
       end
     end
-
   end
 end

data/lib/bosh/director/instance_updater.rb

@@ -12,10 +12,10 @@ module Bosh::Director
     attr_reader :current_state
 
     # @params [DeploymentPlan::Instance] instance
-    def initialize(instance, event_ticker)
+    def initialize(instance, event_log_task)
       @cloud = Config.cloud
       @logger = Config.logger
-      @ticker = event_ticker
+      @event_log_task = event_log_task
       @blobstore = App.instance.blobstores.blobstore
 
       @instance = instance
@@ -42,7 +42,7 @@ module Bosh::Director
     end
 
     def report_progress
-      @ticker.advance(100.0 / update_steps())
+      @event_log_task.advance(100.0 / update_steps())
     end
 
     def update_steps

data/lib/bosh/director/job_runner.rb

@@ -58,7 +58,7 @@ module Bosh::Director
       @debug_logger.level = Config.logger.level
       @debug_logger.formatter = ThreadFormatter.new
 
-      Config.event_log = EventLog.new(event_log)
+      Config.event_log = EventLog::Log.new(event_log)
       Config.result = TaskResultFile.new(result_log)
       Config.logger = @debug_logger
 

data/lib/bosh/director/job_updater.rb

@@ -10,20 +10,8 @@ module Bosh::Director
       @event_log = Config.event_log
     end
 
-    def delete_unneeded_instances
-      @logger.info("Deleting no longer needed instances")
-      unneeded_instances = @job.unneeded_instances
-
-      return if unneeded_instances.empty?
-
-      @event_log.begin_stage("Deleting unneeded instances", unneeded_instances.size, [@job.name])
-      deleter = InstanceDeleter.new(@deployment_plan)
-      deleter.delete_instances(unneeded_instances, max_threads: @job.update.max_in_flight)
-
-      @logger.info("Deleted no longer needed instances")
-    end
-
     def update
+      @logger.info("Deleting no longer needed instances")
       delete_unneeded_instances
 
       instances = []
@@ -37,68 +25,27 @@ module Bosh::Director
       end
 
       @logger.info("Found #{instances.size} instances to update")
-
-      @event_log.begin_stage("Updating job", instances.size, [ @job.name ])
+      event_log_stage = @event_log.begin_stage("Updating job", instances.size, [ @job.name ])
 
       ThreadPool.new(:max_threads => @job.update.max_in_flight).wrap do |pool|
         num_canaries = [ @job.update.canaries, instances.size ].min
+        @logger.info("Starting canary update num_canaries=#{num_canaries}")
+        update_canaries(pool, instances, num_canaries, event_log_stage)
 
-        @logger.info("Starting canary update")
-        # Canaries first
-        num_canaries.times do
-          instance = instances.shift
-
-          pool.process do
-            desc = "#{@job.name}/#{instance.index}"
-            @event_log.track("#{desc} (canary)") do |ticker|
-              with_thread_name("canary_update(#{desc})") do
-                unless @job.should_halt?
-                  begin
-                    InstanceUpdater.new(instance, ticker).
-                      update(:canary => true)
-                  rescue Exception => e
-                    @logger.error("Error updating canary instance: #{e}\n" +
-                                  "#{e.backtrace.join("\n")}")
-                    @job.record_update_error(e, :canary => true)
-                  end
-                end
-              end
-            end
-          end
-        end
-
+        @logger.info("Waiting for canaries to update")
         pool.wait
-        @logger.info("Finished canary update")
 
+        @logger.info("Finished canary update")
         if @job.should_halt?
           @logger.warn("Halting deployment due to a canary failure")
           halt
         end
 
-        # Continue with the rest of the updates
         @logger.info("Continuing the rest of the update")
-        instances.each do |instance|
-          pool.process do
-            desc = "#{@job.name}/#{instance.index}"
-            @event_log.track(desc) do |ticker|
-              with_thread_name("instance_update(#{desc})") do
-                unless @job.should_halt?
-                  begin
-                    InstanceUpdater.new(instance, ticker).update
-                  rescue Exception => e
-                    @logger.error("Error updating instance: #{e}\n" +
-                                  "#{e.backtrace.join("\n")}")
-                    @job.record_update_error(e)
-                  end
-                end
-              end
-            end
-          end
-        end
+        update_instances(pool, instances, event_log_stage)
       end
 
       @logger.info("Finished the rest of the update")
-
       if @job.should_halt?
         @logger.warn("Halting deployment due to an update failure")
         halt
@@ -106,10 +53,65 @@ module Bosh::Director
     end
 
     def halt
-      error = @job.halt_exception ||
-        RuntimeError.new("Deployment has been halted")
-      raise error
+      raise(@job.halt_exception || RuntimeError.new("Deployment has been halted"))
+    end
+
+    private
+
+    def delete_unneeded_instances
+      unneeded_instances = @job.unneeded_instances
+      return if unneeded_instances.empty?
+
+      event_log_stage = @event_log.begin_stage("Deleting unneeded instances", unneeded_instances.size, [@job.name])
+      deleter = InstanceDeleter.new(@deployment_plan)
+      deleter.delete_instances(unneeded_instances, event_log_stage, max_threads: @job.update.max_in_flight)
+
+      @logger.info("Deleted no longer needed instances")
+    end
+
+    def update_canaries(pool, instances, num_canaries, event_log_stage)
+      num_canaries.times do
+        instance = instances.shift
+        pool.process { update_canary_instance(instance, event_log_stage) }
+      end
     end
 
+    def update_canary_instance(instance, event_log_stage)
+      desc = "#{@job.name}/#{instance.index}"
+      event_log_stage.advance_and_track("#{desc} (canary)") do |ticker|
+        next if @job.should_halt?
+
+        with_thread_name("canary_update(#{desc})") do
+          begin
+            InstanceUpdater.new(instance, ticker).update(:canary => true)
+          rescue Exception => e
+            @logger.error("Error updating canary instance: #{e.inspect}\n#{e.backtrace.join("\n")}")
+            @job.record_update_error(e, :canary => true)
+          end
+        end
+      end
+    end
+
+    def update_instances(pool, instances, event_log_stage)
+      instances.each do |instance|
+        pool.process { update_instance(instance, event_log_stage) }
+      end
+    end
+
+    def update_instance(instance, event_log_stage)
+      desc = "#{@job.name}/#{instance.index}"
+      event_log_stage.advance_and_track(desc) do |ticker|
+        next if @job.should_halt?
+
+        with_thread_name("instance_update(#{desc})") do
+          begin
+            InstanceUpdater.new(instance, ticker).update
+          rescue Exception => e
+            @logger.error("Error updating instance: #{e.inspect}\n#{e.backtrace.join("\n")}")
+            @job.record_update_error(e)
+          end
+        end
+      end
+    end
   end
 end

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Jobs
     class BaseJob

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Jobs
     class UpdateDeployment < BaseJob
@@ -52,8 +50,8 @@ module Bosh::Director
 
       def update
         resource_pools = DeploymentPlan::ResourcePools.new(event_log, @resource_pool_updaters)
-
-        updater = DeploymentPlan::Updater.new(self, event_log, resource_pools, @assembler, @deployment_plan)
+        multi_job_updater = DeploymentPlan::BatchMultiJobUpdater.new
+        updater = DeploymentPlan::Updater.new(self, event_log, resource_pools, @assembler, @deployment_plan, multi_job_updater)
         updater.update
       end
 

data/lib/bosh/director/resource_pool_updater.rb

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   class ResourcePoolUpdater
-
     def initialize(resource_pool)
       @resource_pool = resource_pool
       @cloud = Config.cloud

data/lib/bosh/director/validation_helper.rb

@@ -1,8 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module ValidationHelper
-
     def safe_property(hash, property, options = {})
       result = nil
 
@@ -48,8 +45,7 @@ module Bosh::Director
 
     def invalid_type(property, klass, value)
       raise ValidationInvalidType,
-            "Property `#{property}' (value #{value.inspect}) did not match the required type `#{klass}'"
+        "Property `#{property}' (value #{value.inspect}) did not match the required type `#{klass}'"
     end
-
   end
 end

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1623'
+    VERSION = '1.5.0.pre.1633'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1623
+  version: 1.5.0.pre.1633
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-22 00:00:00.000000000 Z
+date: 2013-12-23 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.5.0.pre.1623
+        version: 1.5.0.pre.1633
   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.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   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.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   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.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1623
+        version: 1.5.0.pre.1633
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  bf7b9f'
+  72d86c'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -570,6 +570,7 @@ files:
 - lib/bosh/director/deployment_plan/instance.rb
 - lib/bosh/director/deployment_plan/job.rb
 - lib/bosh/director/deployment_plan/manual_network.rb
+- lib/bosh/director/deployment_plan/multi_job_updater.rb
 - lib/bosh/director/deployment_plan/network.rb
 - lib/bosh/director/deployment_plan/network_subnet.rb
 - lib/bosh/director/deployment_plan/planner.rb