bosh-director 1.3137.0 → 1.3138.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248703d15229ac586854892a69b766baeebad0b3
-  data.tar.gz: 09fad2f07538ac769af1f976f0cb3fdb31bc4fd2
+  metadata.gz: 2d53c72ce355df501653a7710e3219443385b4ab
+  data.tar.gz: 4dabb374ff6da9561e50d6ebd9461935d5aba13b
 SHA512:
-  metadata.gz: 633b3ad6e20f78fe763758bf6b609e8db69249a3923adcb7c62443b17aa77d5a76e69a309565764567a81b361410aa0c7e0d61a5cd8ebbb921d662ace6750e04
-  data.tar.gz: 580465eccf15ebcf71faa96746a1e14fcc3df8b2f08f13b1e99c2780e5ec9a5f99facaef960eed84e4ced4fd3565140fbe5cf5155c6fec375eaa3b55d9e1a406
+  metadata.gz: e7bd8ad5ebcebd2e56a4c5a544041e03e86adbf8594782fd8bf68f4f650cabd490f8f3bdc48cba9a4aeab9b2e465e30a3266ea8f3bf54585289beaa8e017bd06
+  data.tar.gz: 3308c71035950b31ad17ac054de5045a3493435ea631da55944fb66aab4a278463fb9d741d61be1d3239589573670ced02a6ba0f8cd230059c593552ae2eeb1b

data/lib/bosh/director/blob_util.rb

@@ -22,9 +22,8 @@ module Bosh::Director
       blobstore_id
     end
 
-    def self.replace_blob(old_blobstore_id, path)
-      blobstore.delete(old_blobstore_id) if blobstore.exists?(old_blobstore_id)
-      return create_blob path
+    def self.delete_blob(blobstore_id)
+      blobstore.delete(blobstore_id)
     end
 
     def self.save_to_global_cache(compiled_package, cache_key)

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

@@ -64,7 +64,8 @@ module Bosh::Director
       def parse_jobs
         jobs = safe_property(@deployment_manifest, 'jobs', :class => Array, :default => [])
         jobs.each do |job_spec|
-          state_overrides = @job_states.fetch(job_spec['name'], {})
+          # get state specific for this job or all jobs
+          state_overrides = @job_states.fetch(job_spec['name'], @job_states.fetch('*', {}))
           job_spec = job_spec.recursive_merge(state_overrides)
           @deployment.add_job(Job.parse(@deployment, job_spec, @event_log, @logger))
         end

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

@@ -55,8 +55,6 @@ module Bosh::Director
 
       vm_deleter = VmDeleter.new(@instance, @vm_model, @cloud, @logger)
       vm_deleter.delete
-
-      @instance.job.resource_pool.add_idle_vm
     end
 
     def attach_missing_disk

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

@@ -490,22 +490,20 @@ module Bosh::Director
         package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
 
         if @fix
+          package.sha1 = package_meta['sha1']
+
           if package.blobstore_id != nil
-            logger.info("Verifying package #{desc} with blobstore_id: #{package.blobstore_id}")
             validate_tgz(package_tgz, desc)
             fix_package(package, package_tgz)
             return true
           end
-          package.sha1 = package_meta['sha1']
 
           if existing_blob
             pkg = Models::Package.where(blobstore_id: existing_blob).first
-            logger.info("Verifying package #{desc} with blobstore_id: #{existing_blob}")
             fix_package(pkg, package_tgz)
             package.blobstore_id = BlobUtil.copy_blob(pkg.blobstore_id)
             return true
           end
-
         else
           return false unless package.blobstore_id.nil?
           package.sha1 = package_meta['sha1']
@@ -638,10 +636,15 @@ module Bosh::Director
       end
 
       def fix_package(package, package_tgz)
-        single_step_stage("Fixing package '#{package.name}/#{package.version}'") do
-          logger.info("Fixing package '#{package.name}/#{package.version}'")
-          package.blobstore_id = BlobUtil.replace_blob(package.blobstore_id, package_tgz)
+        begin
+          logger.info("Deleting package '#{package.name}/#{package.version}'")
+          BlobUtil.delete_blob(package.blobstore_id)
+        rescue Bosh::Blobstore::BlobstoreError => e
+          logger.info("Error deleting blob '#{package.blobstore_id}, #{package.name}/#{package.version}': #{e.inspect}")
         end
+        package.blobstore_id = BlobUtil.create_blob(package_tgz)
+        logger.info("Re-created package '#{package.name}/#{package.version}' \
+with blobstore_id '#{package.blobstore_id}'")
       end
     end
   end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3137.0'
+    VERSION = '1.3138.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3137.0
+  version: 1.3138.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-16 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.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3137.0
+        version: 1.3138.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement