bosh-director 1.3115.0 → 1.3120.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55328ec9d042beefb1bf840777ea01ef3e2f22ed
-  data.tar.gz: d2af38792bd179f949e3cf79c9dab94ef12de2e6
+  metadata.gz: c1eacdabcbd476e1f91d998548798bb89eb9c4ad
+  data.tar.gz: 0c5e2a9e7dc48d82345507e4517efbb1e4288f30
 SHA512:
-  metadata.gz: 09953e2a0f95ea0da277f98ee89948b740e0b40c286cb1585128a91848a47662d30e97da9eb1ca4e34d646b58905d9f2f8ae4ba0889b9d2a34e1183854e07f3e
-  data.tar.gz: e8afa094deb406029e902b414e852212c9f384d6e015a122baee7ae4fe31ebb3b38a29288aa440919cb763ff54e0a57475edd0a85a1101f06e02a3d15abcd89e
+  metadata.gz: 019db9f1123839223530f8d344d11970b0adf971cf22b1eae5a244a4793f845e05cdf18e5b008caf38c7f39ef16037d57d4568d29b675f5b1bd6d8e9d7e660af
+  data.tar.gz: 76dbb0c9467656cd9d67f035bfaf69d7d3e064f24e703e159a5a8ea6ae078097c483b10164ee52cf803d629cb77a00256ab10c1d695bf37a6f0ea138dbbc14b1

data/lib/bosh/director/api/controllers/deployments_controller.rb

@@ -264,7 +264,10 @@ module Bosh::Director
         jobs_json = json_decode(request.body)['jobs']
         payload = convert_job_instance_hash(jobs_json)
 
-        start_task { @problem_manager.scan_and_fix(current_user, params[:deployment], payload) }
+        deployment = @deployment_manager.find_by_name(params[:deployment])
+        if deployment_has_instance_to_resurrect?(deployment)
+          start_task { @problem_manager.scan_and_fix(current_user, params[:deployment], payload) }
+        end
       end
 
       post '/', :consumes => :yaml do
@@ -321,6 +324,16 @@ module Bosh::Director
           jobs + indicies.map { |index| [job, index] }
         end
       end
+
+      def deployment_has_instance_to_resurrect?(deployment)
+        false if deployment.nil?
+        filter = {
+          deployment_id: deployment.id,
+          resurrection_paused: false
+        }
+        instances = @instance_manager.filter_by(filter)
+        instances.any?
+      end
     end
   end
 end

data/lib/bosh/director/api/controllers/releases_controller.rb

@@ -6,7 +6,8 @@ module Bosh::Director
       post '/', :consumes => :json do
         payload = json_decode(request.body)
         options = {
-          rebase:         params['rebase'] == 'true',
+          rebase: params['rebase'] == 'true',
+          sha1: params['sha1']
         }
         task = @release_manager.create_release_from_url(current_user, payload['location'], options)
         redirect "/tasks/#{task.id}"

data/lib/bosh/director/api/controllers/stemcells_controller.rb

@@ -7,6 +7,7 @@ module Bosh::Director
         payload = json_decode(request.body)
         options = {
             fix: params['fix'] == 'true',
+            sha1: payload['sha1']
         }
         task = @stemcell_manager.create_stemcell_from_url(current_user, payload['location'], options)
         redirect "/tasks/#{task.id}"
@@ -15,6 +16,7 @@ module Bosh::Director
       post '/', :consumes => :multipart do
         options = {
             fix: params['fix'] == 'true',
+            sha1: params['sha1']
         }
         task = @stemcell_manager.create_stemcell_from_file_path(current_user, params[:nginx_upload_path], options)
         redirect "/tasks/#{task.id}"

data/lib/bosh/director/errors.rb

@@ -77,6 +77,7 @@ module Bosh::Director
   ReleaseInvalidPackage = err(30012)
   ReleaseExistingJobFingerprintMismatch = err(30013)
   ReleaseVersionCommitHashMismatch = err(30014)
+  ReleaseSha1DoesNotMatch = err(30015)
 
   ValidationInvalidType = err(40000)
   ValidationMissingField = err(40001)
@@ -88,6 +89,7 @@ module Bosh::Director
   StemcellAlreadyExists = err(50002)
   StemcellNotFound = err(50003, NOT_FOUND)
   StemcellInUse = err(50004)
+  StemcellSha1DoesNotMatch = err(50005)
 
   PackageInvalidArchive = err(60000)
   PackageMissingSourceCode = err(60001)

data/lib/bosh/director/instance_updater.rb

@@ -124,17 +124,6 @@ module Bosh::Director
 
     def start!
       agent.start
-    rescue RuntimeError => e
-      # FIXME: this is somewhat ghetto: we don't have a good way to
-      # negotiate on BOSH protocol between director and agent (yet),
-      # so updating from agent version that doesn't support 'start' RPC
-      # to the one that does might be hard. Right now we decided to
-      # just swallow the exception.
-      # This needs to be removed in one of the following cases:
-      # 1. BOSH protocol handshake gets implemented
-      # 2. All agents updated to support 'start' RPC
-      #    and we no longer care about backward compatibility.
-      @logger.warn("Agent start raised an exception: #{e.inspect}, ignoring for compatibility")
     end
 
     def need_start?

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

@@ -11,6 +11,7 @@ module Bosh::Director
       @compiled_release = false
 
       attr_accessor :release_model
+      attr_reader :release_path, :release_url, :sha1
 
       def self.job_type
         :update_release
@@ -23,6 +24,7 @@ module Bosh::Director
           # file will be downloaded to the release_path
           @release_path = File.join(Dir.tmpdir, "release-#{SecureRandom.uuid}")
           @release_url = release_path
+          @sha1 = options['sha1']
         else
           # file already exists at the release_path
           @release_path = release_path
@@ -39,7 +41,9 @@ module Bosh::Director
         logger.info("Processing update release")
         logger.info("Release rebase will be performed") if @rebase
 
-        single_step_stage("Downloading remote release") { download_remote_release } if @release_url
+        single_step_stage("Downloading remote release") { download_remote_release } if release_url
+
+        single_step_stage("Verifying remote release") { verify_sha1 } if sha1
 
         release_dir = nil
         single_step_stage("Extracting release") { release_dir = extract_release }
@@ -55,11 +59,11 @@ module Bosh::Director
 
       ensure
         FileUtils.rm_rf(release_dir) if release_dir
-        FileUtils.rm_rf(@release_path) if @release_path
+        FileUtils.rm_rf(release_path) if release_path
       end
 
       def download_remote_release
-        download_remote_file('release', @release_url, @release_path)
+        download_remote_file('release', release_url, release_path)
       end
 
       # Extracts release tarball
@@ -67,9 +71,9 @@ module Bosh::Director
       def extract_release
         release_dir = Dir.mktmpdir
 
-        result = Bosh::Exec.sh("tar -C #{release_dir} -xzf #{@release_path} 2>&1", :on_error => :return)
+        result = Bosh::Exec.sh("tar -C #{release_dir} -xzf #{release_path} 2>&1", :on_error => :return)
         if result.failed?
-          logger.error("Failed to extract release archive '#{@release_path}' into dir '#{release_dir}', tar returned #{result.exit_status}, output: #{result.output})")
+          logger.error("Failed to extract release archive '#{release_path}' into dir '#{release_dir}', tar returned #{result.exit_status}, output: #{result.output})")
           FileUtils.rm_rf(release_dir)
           raise ReleaseInvalidArchive, "Extracting release archive failed. Check task debug log for details."
         end
@@ -104,6 +108,13 @@ module Bosh::Director
         @uncommitted_changes = @manifest.fetch("uncommitted_changes", nil)
       end
 
+      def verify_sha1
+        release_hash = Digest::SHA1.file(release_path).hexdigest
+        if release_hash != sha1
+          raise ReleaseSha1DoesNotMatch, "Release SHA1 `#{release_hash}' does not match the expected SHA1 `#{sha1}'"
+        end
+      end
+
       def compiled_release
         raise "Don't know what kind of release we have until verify_release is called" unless @manifest
         @compiled_release

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

@@ -26,6 +26,10 @@ module Bosh::Director
           @stemcell_path = stemcell_path
         end
 
+        if options['sha1']
+          @stemcell_sha1 = options['sha1']
+        end
+
         @cloud = Config.cloud
         @stemcell_manager = Api::StemcellManager.new
         @fix = options['fix']
@@ -40,6 +44,8 @@ module Bosh::Director
 
         stemcell_dir = Dir.mktmpdir("stemcell")
 
+        track_and_log("Verifying remote stemcell") { verify_sha1 } if @stemcell_sha1
+
         track_and_log("Extracting stemcell archive") do
           result = Bosh::Exec.sh("tar -C #{stemcell_dir} -xzf #{@stemcell_path} 2>&1", :on_error => :return)
           if result.failed?
@@ -101,6 +107,13 @@ module Bosh::Director
 
       private
 
+      def verify_sha1
+        stemcell_hash = Digest::SHA1.file(@stemcell_path).hexdigest
+        if stemcell_hash != @stemcell_sha1
+          raise StemcellSha1DoesNotMatch, "Stemcell SHA1 `#{stemcell_hash}' does not match the expected SHA1 `#{@stemcell_sha1}'"
+        end
+      end
+
       def download_remote_stemcell
         download_remote_file('stemcell', @stemcell_url, @stemcell_path)
       end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3115.0'
+    VERSION = '1.3120.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3115.0
+  version: 1.3120.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3115.0
+        version: 1.3120.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement