bosh-director 1.2513.0 → 1.2524.0

data/bin/bosh-director-worker

@@ -2,6 +2,7 @@
 
 require 'erb'
 require 'bosh/director'
+require 'resque/failure/backtrace'
 
 config_file = nil
 index = nil
@@ -71,6 +72,8 @@ Resque.after_fork do
   Thread.new { EM.run }
 end
 
+Resque::Failure.backend = Resque::Failure::Backtrace
+
 worker.log "Starting worker #{worker}"
 
 worker.work(ENV['INTERVAL'] || 5) # interval, will block

data/lib/bosh/director.rb

@@ -86,6 +86,9 @@ require 'bosh/director/resource_pool_updater'
 require 'bosh/director/sequel'
 require 'common/thread_pool'
 
+require 'bosh/director/log_bundles_cleaner'
+require 'bosh/director/logs_fetcher'
+
 require 'bosh/director/cloudcheck_helper'
 require 'bosh/director/problem_handlers/base'
 require 'bosh/director/problem_handlers/invalid_problem'

data/lib/bosh/director/errand.rb

@@ -5,3 +5,4 @@ end
 require 'bosh/director/errand/deployment_preparer'
 require 'bosh/director/errand/job_manager'
 require 'bosh/director/errand/runner'
+require 'bosh/director/errand/result'

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

@@ -0,0 +1,55 @@
+require 'membrane'
+
+module Bosh::Director
+  class Errand::Result
+    attr_reader :exit_code
+
+    AGENT_RUN_ERRAND_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_results(agent_task_result, logs_blobstore_id)
+      AGENT_RUN_ERRAND_RESULT_SCHEMA.validate(agent_task_result)
+      new(*agent_task_result.values_at('exit_code', 'stdout', 'stderr'), logs_blobstore_id)
+    rescue Membrane::SchemaValidationError => e
+      raise AgentInvalidTaskResult, e.message
+    end
+
+    def initialize(exit_code, stdout, stderr, logs_blobstore_id)
+      @exit_code = exit_code
+      @stdout = stdout
+      @stderr = stderr
+      @logs_blobstore_id = logs_blobstore_id
+    end
+
+    def short_description(job_name)
+      title_prefix = "Errand `#{job_name}'"
+      exit_code_suffix = "(exit code #{@exit_code})"
+
+      if @exit_code == 0
+        "#{title_prefix} completed successfully #{exit_code_suffix}"
+      elsif @exit_code > 128
+        "#{title_prefix} was canceled #{exit_code_suffix}"
+      else
+        "#{title_prefix} completed with error #{exit_code_suffix}"
+      end
+    end
+
+    def to_hash
+      {
+        'exit_code' => @exit_code,
+        'stdout' => @stdout,
+        'stderr' => @stderr,
+        'logs' => {
+          'blobstore_id' => @logs_blobstore_id,
+        },
+      }
+    end
+  end
+end

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

@@ -1,51 +1,17 @@
-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::Api::InstanceManager] instance_manager
     # @param [Bosh::Director::EventLog::Log] event_log
-    def initialize(job, result_file, instance_manager, event_log)
+    # @param [Bosh::Director::LogsFetcher] logs_fetcher
+    def initialize(job, result_file, instance_manager, event_log, logs_fetcher)
       @job = job
       @result_file = result_file
       @instance_manager = instance_manager
       @event_log = event_log
       @agent_task_id = nil
+      @logs_fetcher = logs_fetcher
     end
 
     # Runs errand on job instances
@@ -56,8 +22,8 @@ module Bosh::Director
       end
 
       agent_task_result = nil
-
       event_log_stage = @event_log.begin_stage('Running errand', 1)
+
       begin
         event_log_stage.advance_and_track("#{@job.name}/#{instance.index}") do
           start_errand_result = agent.start_errand
@@ -65,25 +31,30 @@ module Bosh::Director
           agent_task_result = agent.wait_for_task(agent_task_id, &blk)
         end
       rescue TaskCancelled => e
+        # Existing run_errand long running task will return a result
+        # after agent cancels the task
         agent_task_result = agent.wait_for_task(agent_task_id)
-        raise e
-      ensure
-        if agent_task_result
-          errand_result = ErrandResult.from_agent_task_result(agent_task_result)
-          @result_file.write(JSON.dump(errand_result.to_hash) + "\n")
-        end
+        @cancel_error = e
       end
 
-      title_prefix = "Errand `#{@job.name}'"
-      exit_code_suffix = "(exit code #{errand_result.exit_code})"
+      begin
+        logs_blobstore_id = @logs_fetcher.fetch(instance.model, 'job', nil)
+      rescue DirectorError => e
+        @fetch_logs_error = e
+      end
 
-      if errand_result.exit_code == 0
-        "#{title_prefix} completed successfully #{exit_code_suffix}"
-      elsif errand_result.exit_code > 128
-        "#{title_prefix} was canceled #{exit_code_suffix}"
-      else
-        "#{title_prefix} completed with error #{exit_code_suffix}"
+      if agent_task_result
+        errand_result = Errand::Result.from_agent_task_results(agent_task_result, logs_blobstore_id)
+        @result_file.write(JSON.dump(errand_result.to_hash) + "\n")
       end
+
+      # Prefer to raise cancel error because
+      # it was triggered before trying to fetch logs
+      raise @cancel_error if @cancel_error
+
+      raise @fetch_logs_error if @fetch_logs_error
+
+      errand_result.short_description(@job.name)
     end
 
     def cancel

data/lib/bosh/director/job_runner.rb

@@ -11,25 +11,27 @@ module Bosh::Director
         raise DirectorError, "Invalid director job class `#{job_class}'"
       end
 
+      @task_id = task_id
+      setup_task_logging
+
       task_manager = Bosh::Director::Api::TaskManager.new
 
       @job_class = job_class
-      @task = task_manager.find_task(task_id)
-
-      setup_logging
+      @task_logger.info("Looking for task with task id #{@task_id}")
+      @task = task_manager.find_task(@task_id)
     end
 
     # Runs director job
     def run(*args)
       Config.current_job = nil
 
-      @debug_logger.info("Starting task: #{@task.id}")
+      @task_logger.info("Starting task: #{@task_id}")
       started_at = Time.now
 
-      with_thread_name("task:#{@task.id}") { perform_job(*args) }
+      with_thread_name("task:#{@task_id}") { perform_job(*args) }
 
       duration = Duration.duration(Time.now - started_at)
-      @debug_logger.info("Task took #{duration} to process.")
+      @task_logger.info("Task took #{duration} to process.")
     end
 
     # Task checkpoint: updates timestamp so running task isn't marked as
@@ -43,34 +45,31 @@ module Bosh::Director
 
     # Sets up job logging.
     # @return [void]
-    def setup_logging
-      # It's up to a caller to set up task output directory
-      unless @task.output && File.directory?(@task.output)
-        raise DirectorError,
-              "Task directory `#{@task.output}' is missing"
-      end
+    def setup_task_logging
+      log_dir = File.join(Config.base_dir, 'tasks', @task_id.to_s)
+      FileUtils.mkdir_p(log_dir)
 
-      debug_log = File.join(@task.output, "debug")
-      event_log = File.join(@task.output, "event")
-      result_log = File.join(@task.output, "result")
+      debug_log = File.join(log_dir, 'debug')
+      event_log = File.join(log_dir, 'event')
+      result_log = File.join(log_dir, 'result')
 
-      @debug_logger = Logger.new(debug_log)
-      @debug_logger.level = Config.logger.level
-      @debug_logger.formatter = ThreadFormatter.new
+      @task_logger = Logger.new(debug_log)
+      @task_logger.level = Config.logger.level
+      @task_logger.formatter = ThreadFormatter.new
 
       Config.event_log = EventLog::Log.new(event_log)
       Config.result = TaskResultFile.new(result_log)
-      Config.logger = @debug_logger
+      Config.logger = @task_logger
 
-      Config.db.logger = @debug_logger
+      Config.db.logger = @task_logger
 
       if Config.dns_enabled?
-        Config.dns_db.logger = @debug_logger
+        Config.dns_db.logger = @task_logger
       end
 
-      cpi_log = File.join(@task.output, "cpi")
-      Config.cloud_options["properties"] ||= {}
-      Config.cloud_options["properties"]["cpi_log"] = cpi_log
+      cpi_log = File.join(log_dir, 'cpi')
+      Config.cloud_options['properties'] ||= {}
+      Config.cloud_options['properties']['cpi_log'] = cpi_log
     end
 
     # Instantiates and performs director job.
@@ -78,17 +77,17 @@ module Bosh::Director
     #   instantiate the new job object.
     # @return [void]
     def perform_job(*args)
-      @debug_logger.info("Creating job")
+      @task_logger.info('Creating job')
 
       job = @job_class.new(*args)
       Config.current_job = job
 
-      job.task_id = @task.id
+      job.task_id = @task_id
       job.task_checkpoint # cancelled in the queue?
 
       run_checkpointing
 
-      @debug_logger.info("Performing task: #{@task.id}")
+      @task_logger.info("Performing task: #{@task.id}")
 
       @task.state = :processing
       @task.timestamp = Time.now
@@ -97,16 +96,16 @@ module Bosh::Director
 
       result = job.perform
 
-      @debug_logger.info("Done")
+      @task_logger.info('Done')
       finish_task(:done, result)
 
     rescue Bosh::Director::TaskCancelled => e
       log_exception(e)
-      @debug_logger.info("Task #{@task.id} cancelled")
-      finish_task(:cancelled, "task cancelled")
+      @task_logger.info("Task #{@task.id} cancelled")
+      finish_task(:cancelled, 'task cancelled')
     rescue Exception => e
       log_exception(e)
-      @debug_logger.error("#{e}\n#{e.backtrace.join("\n")}")
+      @task_logger.error("#{e}\n#{e.backtrace.join("\n")}")
       finish_task(:error, e)
     end
 

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

@@ -1,27 +1,23 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Jobs
     class FetchLogs < BaseJob
       include LockHelper
 
-      DEFAULT_BUNDLE_LIFETIME = 86400 * 10 # 10 days
-
       @queue = :normal
 
-      attr_accessor :bundle_lifetime
-
       def self.job_type
         :fetch_logs
       end
 
       def initialize(instance_id, options = {})
-        @blobstore = options.fetch(:blobstore) { App.instance.blobstores.blobstore }
         @instance_id = instance_id
         @log_type = options["type"] || "job"
         @filters = options["filters"]
         @instance_manager = Api::InstanceManager.new
-        @bundle_lifetime = DEFAULT_BUNDLE_LIFETIME
+
+        blobstore = options.fetch(:blobstore) { App.instance.blobstores.blobstore }
+        log_bundles_cleaner = LogBundlesCleaner.new(blobstore, 60 * 60 * 24 * 10, logger) # 10 days
+        @logs_fetcher = LogsFetcher.new(event_log, @instance_manager, log_bundles_cleaner, logger)
       end
 
       def perform
@@ -29,71 +25,15 @@ module Bosh::Director
         desc = "#{instance.job}/#{instance.index}"
 
         deployment = instance.deployment
-
         if deployment.nil?
           raise InstanceDeploymentMissing,
                 "`#{desc}' doesn't belong to any deployment"
         end
 
         with_deployment_lock(deployment) do
-          cleanup_old_bundles
-
-          event_log.begin_stage("Fetching logs for #{desc}", 1)
-
-          agent = @instance_manager.agent_client_for(instance)
-          blobstore_id = nil
-
-          track_and_log("Finding and packing log files") do
-            logger.info("Fetching logs from agent: " +
-                         "log_type='#{@log_type}', filters='#{@filters}'")
-
-            task = agent.fetch_logs(@log_type, @filters)
-            blobstore_id = task["blobstore_id"]
-          end
-
-          if blobstore_id.nil?
-            raise AgentTaskNoBlobstoreId,
-                  "Agent didn't return a blobstore object id for packaged logs"
-          end
-
-          Models::LogBundle.create(:blobstore_id => blobstore_id,
-                                   :timestamp => Time.now)
-
-          # The returned value of this method is used as task result
-          # and gets extracted by CLI as a tarball blobstore id
-          blobstore_id
-        end
-      end
-
-      def cleanup_old_bundles
-        old_bundles = Models::LogBundle.filter("timestamp <= ?",
-                                               Time.now - bundle_lifetime)
-        count = old_bundles.count
-
-        if count == 0
-          logger.info("No old bundles to delete")
-          return
-        end
-
-        logger.info("Deleting #{count} old log bundle#{count > 1 ? "s" : ""}")
-
-        old_bundles.each do |bundle|
-          begin
-            logger.info("Deleting log bundle #{bundle.id}: " +
-                        "#{bundle.blobstore_id}")
-            @blobstore.delete(bundle.blobstore_id)
-            bundle.delete
-          rescue Bosh::Blobstore::BlobstoreError => e
-            logger.warn("Could not delete #{bundle.blobstore_id}: #{e}")
-            # Assuming object has been deleted from blobstore by someone else,
-            # cleaning up DB record accordingly
-            if e.kind_of?(Bosh::Blobstore::NotFound)
-              bundle.delete
-            end
-          end
+          @logs_fetcher.fetch(instance, @log_type, @filter)
         end
       end
-
     end
   end
 end

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

@@ -16,11 +16,13 @@ module Bosh::Director
       @deployment_manager = Api::DeploymentManager.new
       @instance_manager = Api::InstanceManager.new
       @blobstore = App.instance.blobstores.blobstore
+
+      log_bundles_cleaner = LogBundlesCleaner.new(@blobstore, 60 * 60 * 24 * 10, logger) # 10 days
+      @logs_fetcher = LogsFetcher.new(event_log, @instance_manager, log_bundles_cleaner, logger)
     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, {})
 
@@ -39,18 +41,21 @@ module Bosh::Director
         raise InstanceNotFound, "Instance `#{@deployment_name}/#{@errand_name}/0' doesn't exist"
       end
 
-      runner = Errand::Runner.new(job, result_file, @instance_manager, event_log)
+      runner = Errand::Runner.new(job, result_file, @instance_manager, event_log, @logs_fetcher)
 
-      with_updated_instances(deployment, job) do
-        logger.info('Starting to run errand')
+      cancel_blk = lambda {
+        begin
+          task_checkpoint
+        rescue TaskCancelled => e
+          runner.cancel
+          raise e
+        end
+      }
 
-        runner.run do
-          begin
-            task_checkpoint
-          rescue TaskCancelled => e
-            runner.cancel
-            raise e
-          end
+      with_deployment_lock(deployment) do
+        with_updated_instances(deployment, job) do
+          logger.info('Starting to run errand')
+          runner.run(&cancel_blk)
         end
       end
     end
@@ -62,51 +67,43 @@ module Bosh::Director
     private
 
     def with_updated_instances(deployment, job, &blk)
-      with_deployment_lock(deployment) do
-        begin
-          logger.info('Starting to prepare for deployment')
-          prepare_deployment(deployment, job)
-
-          logger.info('Starting to update resource pool')
-          rp_manager(job).update
+      deployment_preparer = Errand::DeploymentPreparer.new(deployment, job, event_log, self)
 
-          logger.info('Starting to update job instances')
-          job_manager(deployment, job).update_instances
+      rp_updaters = [ResourcePoolUpdater.new(job.resource_pool)]
+      rp_manager = DeploymentPlan::ResourcePools.new(event_log, rp_updaters)
 
-          blk.call
-        ensure
-          ignore_cancellation do
-            logger.info('Starting to delete job instances')
-            job_manager(deployment, job).delete_instances
+      job_manager = Errand::JobManager.new(deployment, job, @blobstore, event_log)
 
-            logger.info('Starting to refill resource pool')
-            rp_manager(job).refill
-          end
-        end
+      begin
+        update_instances(deployment_preparer, rp_manager, job_manager)
+        blk.call
+      ensure
+        delete_instances(rp_manager, job_manager)
       end
     end
 
-    def ignore_cancellation
-      @ignore_cancellation = true
-      yield
-      @ignore_cancellation = false
-    end
-
-    def prepare_deployment(deployment, job)
-      deployment_preparer = Errand::DeploymentPreparer.new(
-        deployment, job, event_log, self)
-
+    def update_instances(deployment_preparer, rp_manager, job_manager)
+      logger.info('Starting to prepare for deployment')
       deployment_preparer.prepare_deployment
       deployment_preparer.prepare_job
-    end
 
-    def rp_manager(job)
-      rp_updaters = [ResourcePoolUpdater.new(job.resource_pool)]
-      DeploymentPlan::ResourcePools.new(event_log, rp_updaters)
+      logger.info('Starting to update resource pool')
+      rp_manager.update
+
+      logger.info('Starting to update job instances')
+      job_manager.update_instances
     end
 
-    def job_manager(deployment, job)
-      Errand::JobManager.new(deployment, job, @blobstore, event_log)
+    def delete_instances(rp_manager, job_manager)
+      @ignore_cancellation = true
+
+      logger.info('Starting to delete job instances')
+      job_manager.delete_instances
+
+      logger.info('Starting to refill resource pool')
+      rp_manager.refill
+
+      @ignore_cancellation = false
     end
   end
 end

data/lib/bosh/director/log_bundles_cleaner.rb

@@ -0,0 +1,34 @@
+module Bosh::Director
+  class LogBundlesCleaner
+    def initialize(blobstore, log_bundle_ttl, logger)
+      @blobstore = blobstore
+      @bundle_lifetime = log_bundle_ttl
+      @logger = logger
+    end
+
+    def register_blobstore_id(blobstore_id)
+      @logger.info("Registering log bundle with blobstore id #{blobstore_id}")
+      Models::LogBundle.create(blobstore_id: blobstore_id, timestamp: Time.now)
+    end
+
+    def clean
+      cut_off_time = Time.now - @bundle_lifetime
+      old_bundles = Models::LogBundle.filter("timestamp <= ?", cut_off_time)
+      @logger.info("Deleting #{old_bundles.count} old log bundle(s) before #{cut_off_time}")
+
+      old_bundles.each do |bundle|
+        begin
+          @logger.info("Deleting log bundle #{bundle.id} with blobstore id #{bundle.blobstore_id}")
+          @blobstore.delete(bundle.blobstore_id)
+          bundle.delete
+        rescue Bosh::Blobstore::BlobstoreError => e
+          @logger.warn("Could not delete #{bundle.blobstore_id}: #{e.inspect}")
+
+          # Assuming object has been deleted from blobstore by someone else,
+          # cleaning up DB record accordingly
+          bundle.delete if e.kind_of?(Bosh::Blobstore::NotFound)
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/logs_fetcher.rb

@@ -0,0 +1,40 @@
+module Bosh::Director
+  class LogsFetcher
+    # @param [Bosh::Director::EventLog::Log] event_log
+    # @param [Bosh::Director::Api::InstanceManager] instance_manager
+    # @param [Bosh::Director::LogBundlesCleaner] log_bundles_cleaner
+    def initialize(event_log, instance_manager, log_bundles_cleaner, logger)
+      @event_log = event_log
+      @instance_manager = instance_manager
+      @log_bundles_cleaner = log_bundles_cleaner
+      @logger = logger
+    end
+
+    # @param [Models::Instance] instance
+    # @param [String] log_type
+    # @param [Array] filters
+    def fetch(instance, log_type, filters)
+      @logger.info("Fetching logs from agent with log_type=#{log_type} filters=#{filters}")
+
+      @log_bundles_cleaner.clean
+
+      agent = @instance_manager.agent_client_for(instance)
+      blobstore_id = nil
+
+      stage = @event_log.begin_stage("Fetching logs for #{instance.job}/#{instance.index}", 1)
+      stage.advance_and_track('Finding and packing log files') do
+        fetch_logs_result = agent.fetch_logs(log_type, filters)
+        blobstore_id = fetch_logs_result['blobstore_id']
+      end
+
+      if blobstore_id.nil?
+        raise AgentTaskNoBlobstoreId,
+              "Agent didn't return a blobstore object id for packaged logs"
+      end
+
+      @log_bundles_cleaner.register_blobstore_id(blobstore_id)
+
+      blobstore_id
+    end
+  end
+end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2513.0'
+    VERSION = '1.2524.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2513.0
+  version: 1.2524.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-01 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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.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.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2513.0
+        version: 1.2524.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -331,6 +331,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.23.0
+- !ruby/object:Gem::Dependency
+  name: resque-backtrace
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -509,7 +525,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  f90a96'
+  0501e4'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -647,6 +663,7 @@ files:
 - lib/bosh/director/errand.rb
 - lib/bosh/director/errand/deployment_preparer.rb
 - lib/bosh/director/errand/job_manager.rb
+- lib/bosh/director/errand/result.rb
 - lib/bosh/director/errand/runner.rb
 - lib/bosh/director/errors.rb
 - lib/bosh/director/event_log.rb
@@ -686,6 +703,8 @@ files:
 - lib/bosh/director/jobs/vm_state.rb
 - lib/bosh/director/lock.rb
 - lib/bosh/director/lock_helper.rb
+- lib/bosh/director/log_bundles_cleaner.rb
+- lib/bosh/director/logs_fetcher.rb
 - lib/bosh/director/models.rb
 - lib/bosh/director/models/compiled_package.rb
 - lib/bosh/director/models/deployment.rb
@@ -765,7 +784,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1542648012288925721
+      hash: 451459249491372801
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23