bosh-director 1.3191.0 → 1.3192.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91dd7a0db4b29bac6929107f6ec8b9a740d2597b
-  data.tar.gz: 013e9d54f16d6195563d2541e2bef8250354545f
+  metadata.gz: a2d9bb9d2c7f59003ca9e179f81b039813c1e2f3
+  data.tar.gz: b16bed7efd37706ca30fedf42d6354d7789ccbf0
 SHA512:
-  metadata.gz: 68c7bf9d9741ac9e25aab652b664521b9944b416dc5d05287f8d957121d71747e4b4cff928405d6f2cefced884cb6fed32ce591aaee1658e5694f93b6e40017d
-  data.tar.gz: 8594bc544375b74ea3cadd241049a80bd9ba45cd3b5372810d77202ec54b20f343faedd9d71cdf3fb1151e7c87795e1233e1e1ef7774123f9dc49896e9a31e18
+  metadata.gz: 534311499645c69972ef2a1b487a5a5659803c1e33dd9c303210929afeef2f90a1bd71de8d7775489fac690bddf7b4903e5cf294b0352a9620c9ef7fa2470833
+  data.tar.gz: c27b51664bad54f0b6417d83497be659677ac13f0eedd2731fe44bdd3cfe12efaaccee54c1c461e13ce32d588d4fab687a8932915328f6c9155e7eabab441802

data/lib/bosh/director/jobs/release/release_job.rb

@@ -15,26 +15,41 @@ module Bosh::Director
       @logger = logger
     end
 
-    def create
-      template = create_template
+    def update(template)
+      template.release = @release_model
+      template.name = @name
+      template.sha1 = @sha1
+      template.fingerprint = @fingerprint
+      template.version = @version
+
       unpack
 
       job_manifest = load_manifest
       validate_templates(job_manifest)
       validate_monit
 
+      if template.blobstore_id
+        begin
+          @logger.info("Deleting blob for template '#{@name}/#{@version}' with blobstore_id '#{template.blobstore_id}'")
+          BlobUtil.delete_blob(template.blobstore_id)
+          template.blobstore_id = nil
+        rescue Bosh::Blobstore::BlobstoreError => e
+          @logger.info("Error deleting blob for template '#{@name}/#{@version}' with blobstore_id '#{template.blobstore_id}': #{e.inspect}")
+        end
+      end
+
       template.blobstore_id = BlobUtil.create_blob(job_tgz)
       template.package_names = parse_package_names(job_manifest)
 
       validate_logs(job_manifest)
-      template.logs = job_manifest['logs'] if job_manifest['logs']
+      template.logs = job_manifest['logs']
 
       validate_properties(job_manifest)
-      template.properties = job_manifest['properties'] if job_manifest['properties']
+      template.properties = job_manifest['properties']
 
       validate_links(job_manifest)
-      template.provides = job_manifest['provides'] if job_manifest['provides']
-      template.requires = job_manifest['requires'] if job_manifest['requires']
+      template.provides = job_manifest['provides']
+      template.requires = job_manifest['requires']
 
       template.save
     end
@@ -62,21 +77,6 @@ module Bosh::Director
       @job_dir ||= File.join(@release_dir, 'jobs', @name)
     end
 
-    def create_template
-      template_attrs = {
-        :release => @release_model,
-        :name => @name,
-        :sha1 => @sha1,
-        :fingerprint => @fingerprint,
-        :version => @version
-      }
-
-      @logger.info("Creating job template `#{@name}/#{@version}' " +
-          'from provided bits')
-      Models::Template.new(template_attrs)
-    end
-
-
     def load_manifest
       manifest_file = File.join(job_dir, 'job.MF')
       unless File.file?(manifest_file)

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

@@ -385,8 +385,8 @@ module Bosh::Director
           stemcell = compiled_package_spec[:stemcell]
           compiled_pkg_tgz = File.join(release_dir, 'compiled_packages', "#{package.name}.tgz")
 
-          existing_compiled_package = Models::CompiledPackage.where(:package_id => package.id, :stemcell_id => stemcell.id)
-          if existing_compiled_package.empty?
+          existing_compiled_packages = Models::CompiledPackage.where(:package_id => package.id, :stemcell_id => stemcell.id)
+          if existing_compiled_packages.empty?
 
             package_desc = "#{package.name}/#{package.version} for #{stemcell.name}/#{stemcell.version}"
             event_log.track(package_desc) do
@@ -398,7 +398,9 @@ module Bosh::Director
               had_effect = true
             end
           elsif @fix
-            fix_compiled_package(existing_compiled_package.first, compiled_pkg_tgz)
+            existing_compiled_package = existing_compiled_packages.first
+            @packages[existing_compiled_package.name] = existing_compiled_package
+            fix_compiled_package(existing_compiled_package, compiled_pkg_tgz)
           end
         end
 
@@ -490,12 +492,15 @@ module Bosh::Director
 
       # @return [boolean] true if a new blob was created; false otherwise
       def save_package_source_blob(package, package_meta, release_dir)
-        name, version, existing_blob, sha1 = package_meta['name'], package_meta['version'], package_meta['blobstore_id'], package_meta['sha1']
+        name = package_meta['name']
+        version = package_meta['version']
+        existing_blob = package_meta['blobstore_id']
+        sha1 = package_meta['sha1']
         desc = "package '#{name}/#{version}'"
         package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
 
         if @fix
-          package.sha1 = package_meta['sha1']
+          package.sha1 = sha1
 
           if package.blobstore_id != nil
             delete_compiled_packages package
@@ -506,14 +511,14 @@ module Bosh::Director
 
           if existing_blob
             pkg = Models::Package.where(blobstore_id: existing_blob).first
-            delete_compiled_packages package
+            delete_compiled_packages(package)
             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']
+          package.sha1 = sha1
 
           if existing_blob
             logger.info("Creating #{desc} from existing blob #{existing_blob}")
@@ -580,7 +585,7 @@ module Bosh::Director
         end
 
         did_something = create_jobs(new_jobs, release_dir)
-        did_something |= use_existing_jobs(existing_jobs)
+        did_something |= use_existing_jobs(existing_jobs, release_dir)
 
         did_something
       end
@@ -604,18 +609,28 @@ module Bosh::Director
 
       def create_job(job_meta, release_dir)
         release_job = ReleaseJob.new(job_meta, @release_model, release_dir, @packages, logger)
-        release_job.create
+        logger.info("Creating job template `#{job_meta['name']}/#{job_meta['version']}' " +
+            'from provided bits')
+        release_job.update(Models::Template.new())
       end
 
       # @param [Array<Array>] jobs Existing jobs metadata
       # @return [boolean] true if at least one job was tied to the release version; false if the call had no effect.
-      def use_existing_jobs(jobs)
+      def use_existing_jobs(jobs, release_dir)
         return false if jobs.empty?
 
         single_step_stage("Processing #{jobs.size} existing job#{"s" if jobs.size > 1}") do
-          jobs.each do |template, _|
+          jobs.each do |template, job_meta|
             job_desc = "#{template.name}/#{template.version}"
-            logger.info("Using existing job `#{job_desc}'")
+
+            if @fix
+              logger.info("Fixing existing job `#{job_desc}'")
+              release_job = ReleaseJob.new(job_meta, @release_model, release_dir, @packages, logger)
+              release_job.update(template)
+            else
+              logger.info("Using existing job `#{job_desc}'")
+            end
+
             register_template(template) unless template.release_versions.include? @release_version_model
           end
         end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3191.0'
+    VERSION = '1.3192.0'
   end
 end

metadata

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