bosh-director 1.3202.0 → 1.3213.0

data/lib/bosh/director/job_queue.rb

@@ -5,8 +5,8 @@ module Bosh::Director
   # Abstracts the resque system.
 
   class JobQueue
-    def enqueue(username, job_class, description, params)
-      task = Api::TaskHelper.new.create_task(username, job_class.job_type, description)
+    def enqueue(username, job_class, description, params, deployment_name = nil)
+      task = Api::TaskHelper.new.create_task(username, job_class.job_type, description, deployment_name)
 
       Resque.enqueue(job_class, task.id, *params)
 

data/lib/bosh/director/job_renderer.rb

@@ -12,8 +12,8 @@ module Bosh::Director
       @logger = logger
     end
 
-    def render_job_instances(instance_plan)
-      instance_plan.each { |instance_plan| render_job_instance(instance_plan) }
+    def render_job_instances(instance_plans)
+      instance_plans.each { |instance_plan| render_job_instance(instance_plan) }
     end
 
     def render_job_instance(instance_plan)

data/lib/bosh/director/job_updater.rb

@@ -31,6 +31,8 @@ module Bosh::Director
       if instance_plans.empty?
         @logger.info("No instances to update for '#{@job.name}'")
         return
+      else
+        @job.did_change = true
       end
 
       instance_plans.each do |instance_plan|
@@ -81,7 +83,11 @@ module Bosh::Director
     def delete_unneeded_instances
       unneeded_instance_plans = @job.obsolete_instance_plans
       unneeded_instances = @job.unneeded_instances
-      return if unneeded_instances.empty?
+      if unneeded_instances.empty?
+        return
+      else
+        @job.did_change = true
+      end
 
       event_log_stage = @event_log.begin_stage('Deleting unneeded instances', unneeded_instances.size, [@job.name])
       dns_manager = DnsManagerProvider.create

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

@@ -9,7 +9,7 @@ module Bosh::Director
       end
 
       def self.enqueue(username, deployment_name, job_name, instance_id, disk_cid, job_queue)
-        job_queue.enqueue(username, Jobs::AttachDisk, "attach disk '#{disk_cid}' to '#{job_name}/#{instance_id}'", [deployment_name, job_name, instance_id, disk_cid])
+        job_queue.enqueue(username, Jobs::AttachDisk, "attach disk '#{disk_cid}' to '#{job_name}/#{instance_id}'", [deployment_name, job_name, instance_id, disk_cid], deployment_name)
       end
 
       def initialize(deployment_name, job_name, instance_id, disk_cid)
@@ -54,8 +54,8 @@ module Bosh::Director
         previous_persistent_disk.update(active: false)
 
         if instance.state == 'stopped'
-          @disk_manager.detach_disk(instance, previous_persistent_disk)
           @disk_manager.unmount_disk(instance, previous_persistent_disk)
+          @disk_manager.detach_disk(instance, previous_persistent_disk)
         end
 
         @disk_manager.orphan_disk(previous_persistent_disk)

data/lib/bosh/director/jobs/cloud_check/apply_resolutions.rb

@@ -35,7 +35,12 @@ module Bosh::Director
 
         def perform
           with_deployment_lock(@deployment) do
-            count = @problem_resolver.apply_resolutions(@resolutions)
+            count, error_message = @problem_resolver.apply_resolutions(@resolutions)
+
+            if error_message
+              raise Bosh::Director::ProblemHandlerError, error_message
+            end
+
             "#{count} resolved"
           end
         end

data/lib/bosh/director/jobs/cloud_check/scan_and_fix.rb

@@ -26,6 +26,9 @@ module Bosh::Director
         def perform
           jobs = filtered_jobs
 
+          resolved_problems = 0
+          error_message = nil
+
           begin
             with_deployment_lock(@deployment, :timeout => 0) do
 
@@ -34,10 +37,18 @@ module Bosh::Director
               scanner.scan_vms(jobs)
 
               resolver = ProblemResolver.new(@deployment)
-              resolver.apply_resolutions(resolutions(jobs))
+              resolved_problems, error_message = resolver.apply_resolutions(resolutions(jobs))
 
               'scan and fix complete'
             end
+            if resolved_problems > 0
+              PostDeploymentScriptRunner.run_post_deploys_after_resurrection(@deployment)
+            end
+
+            if error_message
+              raise Bosh::Director::ProblemHandlerError, error_message
+            end
+
           rescue Lock::TimeoutError
             raise 'Unable to get deployment lock, maybe a deployment is in progress. Try again later.'
           end
@@ -46,7 +57,7 @@ module Bosh::Director
         def resolutions(jobs)
           all_resolutions = {}
           jobs.each do |job, index|
-            instance = @instance_manager.find_by_name(@deployment.name, job, index)
+            instance = @instance_manager.find_by_name(@deployment, job, index)
             next if instance.resurrection_paused
             problems = Models::DeploymentProblem.filter(deployment: @deployment, resource_id: instance.id, state: 'open')
             problems.each do |problem|
@@ -63,7 +74,7 @@ module Bosh::Director
           return @jobs if @fix_stateful_jobs
 
           @jobs.reject do |job, index|
-            instance = @instance_manager.find_by_name(@deployment.name, job, index)
+            instance = @instance_manager.find_by_name(@deployment, job, index)
             instance.persistent_disk
           end
         end

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

@@ -54,7 +54,7 @@ module Bosh::Director
 
         export_release_job = create_job_with_all_the_templates_so_everything_compiles(release_version_model, release, planner, deployment_plan_stemcell)
         planner.add_job(export_release_job)
-        planner.bind_models
+        planner.bind_models(true)
 
         lock_timeout = 15 * 60 # 15 minutes
 

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

@@ -23,10 +23,7 @@ module Bosh::Director
       def perform
         instance = @instance_manager.find_instance(@instance_id)
 
-        deployment = instance.deployment
-        with_deployment_lock(deployment) do
-          @logs_fetcher.fetch(instance, @log_type, @filters)
-        end
+        @logs_fetcher.fetch(instance, @log_type, @filters)
       end
     end
   end

data/lib/bosh/director/jobs/helpers/compiled_package_deleter.rb

@@ -8,10 +8,9 @@ module Bosh::Director::Jobs
 
       def delete(compiled_package, options = {})
         package = compiled_package.package
-        stemcell = compiled_package.stemcell
         @logger.info('Deleting compiled package: ' +
             "#{package.name}/#{package.version}" +
-            "for #{stemcell.name}/#{stemcell.version}")
+            "for #{compiled_package.stemcell_os}/#{compiled_package.stemcell_version}")
 
         errors = []
         if @blob_deleter.delete(compiled_package.blobstore_id, errors,  options['force'])

data/lib/bosh/director/jobs/helpers/stemcell_deleter.rb

@@ -28,22 +28,6 @@ module Bosh::Director::Jobs
             @logger.info("Force deleting is set, ignoring exception: #{e.message}")
           end
 
-          @logger.info('Looking for any compiled packages on this stemcell')
-          compiled_packages = Bosh::Director::Models::CompiledPackage.filter(:stemcell_id => stemcell.id)
-
-          stage = @event_log.begin_stage('Deleting compiled packages',
-            compiled_packages.count, [stemcell.name, stemcell.version])
-          @logger.info('Deleting compiled packages ' +
-              "(#{compiled_packages.count}) for `#{stemcell.name}/#{stemcell.version}'")
-
-          compiled_packages.each do |compiled_package|
-            message = "#{compiled_package.name}/#{compiled_package.version}"
-            stage.advance_and_track(message) do
-              @logger.info(message)
-              @compiled_package_deleter.delete(compiled_package, options)
-            end
-          end
-
           stemcell.destroy
         end
       end

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

@@ -48,8 +48,8 @@ module Bosh::Director
       template.properties = job_manifest['properties']
 
       validate_links(job_manifest)
-      template.provides = job_manifest['provides']
-      template.requires = job_manifest['requires']
+      template.provides = job_manifest['provides'] if job_manifest['provides']
+      template.consumes = job_manifest['consumes'] if job_manifest['consumes']
 
       template.save
     end
@@ -149,21 +149,21 @@ module Bosh::Director
 
     def validate_links(job_manifest)
       parse_links(job_manifest['provides'], 'provides') if job_manifest['provides']
-      parse_links(job_manifest['requires'], 'requires') if job_manifest['requires']
+      parse_links(job_manifest['consumes'], 'consumes') if job_manifest['consumes']
     end
 
-    def parse_links(links, desc)
+    def parse_links(links, kind)
       if !links.is_a?(Array)
         raise JobInvalidLinkSpec,
-          "Job '#{@name}' has invalid spec format: '#{desc}' must be an array of strings or hashes with name and type"
+              "Job '#{@name}' has invalid spec format: '#{kind}' must be an array of hashes with name and type"
       end
 
       parsed_links = {}
       links.each do |link_spec|
-        parsed_link = DeploymentPlan::TemplateLink.parse(link_spec)
+        parsed_link = DeploymentPlan::TemplateLink.parse(kind, link_spec)
         if parsed_links[parsed_link.name]
           raise JobDuplicateLinkName,
-            "Job '#{@name}' '#{desc}' specifies links with duplicate name '#{parsed_link.name}'"
+            "Job '#{@name}' '#{kind}' specifies links with duplicate name '#{parsed_link.name}'"
         end
 
         parsed_links[parsed_link.name] = true

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

@@ -23,7 +23,7 @@ module Bosh::Director
 
     def perform
       deployment_model = @deployment_manager.find_by_name(@deployment_name)
-      deployment_manifest = Manifest.load_from_text(deployment_model.manifest, deployment_model.cloud_config)
+      deployment_manifest = Manifest.load_from_text(deployment_model.manifest, deployment_model.cloud_config, deployment_model.runtime_config)
       deployment_name = deployment_manifest.to_hash['name']
       with_deployment_lock(deployment_name) do
         deployment = nil
@@ -32,7 +32,7 @@ module Bosh::Director
         event_log.begin_stage('Preparing deployment', 1)
         event_log.track('Preparing deployment') do
           planner_factory = DeploymentPlan::PlannerFactory.create(logger)
-          deployment = planner_factory.create_from_manifest(deployment_manifest, deployment_model.cloud_config, {})
+          deployment = planner_factory.create_from_manifest(deployment_manifest, deployment_model.cloud_config, deployment_model.runtime_config, {})
           deployment.bind_models
           job = deployment.job(@errand_name)
 
@@ -40,14 +40,14 @@ module Bosh::Director
             raise JobNotFound, "Errand `#{@errand_name}' doesn't exist"
           end
 
-          unless job.can_run_as_errand?
+          unless job.is_errand?
             raise RunErrandError,
-              "Job `#{job.name}' is not an errand. To mark a job as an errand " +
+              "Instance group '#{job.name}' is not an errand. To mark an instance group as an errand " +
                 "set its lifecycle to 'errand' in the deployment manifest."
           end
 
           if job.instances.empty?
-            raise InstanceNotFound, "Instance `#{@deployment_name}/#{@errand_name}/0' doesn't exist"
+            raise InstanceNotFound, "Instance '#{@deployment_name}/#{@errand_name}/0' doesn't exist"
           end
 
           logger.info('Starting to prepare for deployment')

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

@@ -21,12 +21,12 @@ module Bosh::Director
       def perform
         target = Target.new(@target_payload)
 
-        filter = { deployment_id: @deployment_id }
+        filter = {}
         filter[:job] = target.job if target.job
-
         filter.merge!(target.id_filter)
 
-        instances = @instance_manager.filter_by(filter)
+        deployment = Models::Deployment[@deployment_id]
+        instances = @instance_manager.filter_by(deployment, filter)
 
         ssh_info = instances.map do |instance|
           agent = @instance_manager.agent_client_for(instance)

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

@@ -9,10 +9,11 @@ module Bosh::Director
         :update_deployment
       end
 
-      def initialize(manifest_file_path, cloud_config_id, options = {})
+      def initialize(manifest_file_path, cloud_config_id, runtime_config_id, options = {})
         @blobstore = App.instance.blobstores.blobstore
         @manifest_file_path = manifest_file_path
         @cloud_config_id = cloud_config_id
+        @runtime_config_id = runtime_config_id
         @options = options
       end
 
@@ -28,8 +29,16 @@ module Bosh::Director
           logger.debug("Cloud config:\n#{cloud_config_model.manifest}")
         end
 
-        deployment_manifest = Manifest.load_from_text(manifest_text, cloud_config_model)
+        runtime_config_model = Bosh::Director::Models::RuntimeConfig[@runtime_config_id]
+        if runtime_config_model.nil?
+          logger.debug("No runtime config uploaded yet.")
+        else
+          logger.debug("Runtime config:\n#{runtime_config_model.manifest}")
+        end
+
+        deployment_manifest = Manifest.load_from_text(manifest_text, cloud_config_model, runtime_config_model)
         deployment_name = deployment_manifest.to_hash['name']
+
         with_deployment_lock(deployment_name) do
           @notifier = DeploymentPlan::Notifier.new(deployment_name, Config.nats_rpc, logger)
           @notifier.send_start_event
@@ -39,14 +48,19 @@ module Bosh::Director
           event_log.begin_stage('Preparing deployment', 1)
           event_log.track('Preparing deployment') do
             planner_factory = DeploymentPlan::PlannerFactory.create(logger)
-            deployment_plan = planner_factory.create_from_manifest(deployment_manifest, cloud_config_model, @options)
+            deployment_plan = planner_factory.create_from_manifest(deployment_manifest, cloud_config_model, runtime_config_model, @options)
             deployment_plan.bind_models
           end
 
+          render_job_templates(deployment_plan.jobs_starting_on_deploy)
           deployment_plan.compile_packages
 
-          render_job_templates(deployment_plan.jobs_starting_on_deploy)
           update_step(deployment_plan).perform
+
+          if check_for_changes(deployment_plan)
+            PostDeploymentScriptRunner.run_post_deploys_after_deployment(deployment_plan)
+          end
+
           @notifier.send_end_event
           logger.info('Finished updating deployment')
 
@@ -68,6 +82,13 @@ module Bosh::Director
 
       # Job tasks
 
+      def check_for_changes(deployment_plan)
+        deployment_plan.jobs.each do |job|
+          return true if job.did_change
+        end
+        false
+      end
+
       def update_step(deployment_plan)
         DeploymentPlan::Steps::UpdateStep.new(
           self,
@@ -87,9 +108,24 @@ module Bosh::Director
       end
 
       def render_job_templates(jobs)
+        errors = []
         job_renderer = JobRenderer.create
         jobs.each do |job|
-          job_renderer.render_job_instances(job.needed_instance_plans)
+          begin
+            job_renderer.render_job_instances(job.needed_instance_plans)
+          rescue Exception => e
+            errors.push e
+          end
+        end
+
+        if errors.length > 0
+          message = 'Unable to render instance groups for deployment. Errors are:'
+
+          errors.each do |e|
+            message = "#{message}\n   - #{e.message.gsub(/\n/, "\n  ")}"
+          end
+
+          raise message
         end
       end
     end

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

@@ -30,8 +30,6 @@ module Bosh::Director
           @release_path = release_path
         end
 
-        @release_model, @release_version_model, @manifest, @name, @version = nil, nil, nil, nil, nil
-
         @rebase = !!options['rebase']
         @fix = !!options['fix']
       end
@@ -133,10 +131,10 @@ module Bosh::Director
 
         @version = next_release_version if @rebase
 
-        version_attrs = { :release => @release_model, :version => @version.to_s }
-
         release_is_new = false
-        @release_version_model = Models::ReleaseVersion.find_or_create(version_attrs){ release_is_new = true }
+        @release_version_model = Models::ReleaseVersion.find_or_create(release: @release_model, version: @version.to_s) do
+          release_is_new = true
+        end
 
         if release_is_new
           @release_version_model.uncommitted_changes = @uncommitted_changes if @uncommitted_changes
@@ -214,7 +212,7 @@ module Bosh::Director
             end
           end
 
-          packages = Models::Package.where(fingerprint: package_meta["fingerprint"]).all
+          packages = Models::Package.where(fingerprint: package_meta['fingerprint']).all
 
           if packages.empty?
             new_packages << package_meta
@@ -223,8 +221,8 @@ module Bosh::Director
 
           existing_package = packages.find do |package|
             package.release_id == @release_model.id &&
-            package.name == package_meta["name"] &&
-            package.version == package_meta["version"]
+            package.name == package_meta['name'] &&
+            package.version == package_meta['version']
           end
 
           if existing_package
@@ -240,8 +238,8 @@ module Bosh::Director
               if existing_package.blobstore_id.nil?
                 packages.each do |package|
                   unless package.blobstore_id.nil?
-                    package_meta["blobstore_id"] = package.blobstore_id
-                    package_meta["sha1"] = package.sha1
+                    package_meta['blobstore_id'] = package.blobstore_id
+                    package_meta['sha1'] = package.sha1
                     break
                   end
                 end
@@ -257,8 +255,8 @@ module Bosh::Director
             # of the package blob and create a new db entry for it
             packages.each do |package|
               unless package.blobstore_id.nil?
-                package_meta["blobstore_id"] = package.blobstore_id
-                package_meta["sha1"] = package.sha1
+                package_meta['blobstore_id'] = package.blobstore_id
+                package_meta['sha1'] = package.sha1
                 break
               end
             end
@@ -267,21 +265,19 @@ module Bosh::Director
           end
         end
 
-        package_stemcell_hashes1 = create_packages(new_packages, release_dir)
+        created_package_refs = create_packages(new_packages, release_dir)
 
-        package_stemcell_hashes2 = use_existing_packages(existing_packages, release_dir)
+        existing_package_refs = use_existing_packages(existing_packages, release_dir)
 
         if @compiled_release
-          compatible_stemcell_combos = registered_packages.flat_map do |pkg, pkg_meta|
-            stemcells_used_by_package(pkg_meta).map do |stemcell|
-              {
-                  package: pkg,
-                  stemcell: stemcell
-              }
-            end
+          registered_package_refs = registered_packages.map do |pkg, pkg_meta|
+            {
+              package: pkg,
+              package_meta: pkg_meta,
+            }
           end
-          consolidated_package_stemcell_hashes = Array(package_stemcell_hashes1) | Array(package_stemcell_hashes2) | compatible_stemcell_combos
-          create_compiled_packages(consolidated_package_stemcell_hashes, release_dir, packages_existing_from_other_releases)
+          all_package_refs = Array(created_package_refs) | Array(existing_package_refs) | registered_package_refs
+          create_compiled_packages(all_package_refs, release_dir, packages_existing_from_other_releases)
         else
           backfill_source_for_packages(registered_packages, release_dir)
         end
@@ -307,13 +303,13 @@ module Bosh::Director
 
       # Points release DB model to existing packages described by given metadata
       # @param [Array<Array>] packages Existing packages metadata.
-      # @return [Array<Hash>] package & stemcell matching pairs that were registered. empty if no packages were changed.
+      # @return [Array<Hash>] array of registered package models and their metadata, empty if no packages were changed.
       def use_existing_packages(packages, release_dir)
         if packages.empty?
           return []
         end
 
-        package_stemcell_hashes = []
+        package_refs = []
 
         single_step_stage("Processing #{packages.size} existing package#{"s" if packages.size > 1}") do
           packages.each do |package, package_meta|
@@ -322,11 +318,10 @@ module Bosh::Director
             register_package(package)
 
             if compiled_release
-              stemcells = stemcells_used_by_package(package_meta)
-              stemcells.each do |stemcell|
-                hash = { package: package, stemcell: stemcell}
-                package_stemcell_hashes << hash
-              end
+              package_refs << {
+                package: package,
+                package_meta: package_meta,
+              }
             end
 
             if source_release && (package.blobstore_id.nil? || @fix)
@@ -336,19 +331,19 @@ module Bosh::Director
           end
         end
 
-        return package_stemcell_hashes
+        return package_refs
       end
 
       # Creates packages using provided metadata
       # @param [Array<Hash>] packages Packages metadata
       # @param [String] release_dir local path to the unpacked release
-      # @return [Array<Hash>, boolean] array of compiled package & stemcell matching pairs that were registered, and a
+      # @return [Array<Hash>, boolean] array of package models and their metadata, empty if no packages were changed.
       def create_packages(package_metas, release_dir)
         if package_metas.empty?
           return []
         end
 
-        package_stemcell_hashes = []
+        package_refs = []
 
         event_log.begin_stage("Creating new packages", package_metas.size)
 
@@ -362,15 +357,14 @@ module Bosh::Director
           end
 
           if @compiled_release
-            stemcells = stemcells_used_by_package(package_meta)
-            stemcells.each do |stemcell|
-              hash = { package: package, stemcell: stemcell}
-              package_stemcell_hashes << hash
-            end
+            package_refs << {
+              package: package,
+              package_meta: package_meta,
+            }
           end
         end
 
-        return package_stemcell_hashes
+        return package_refs
       end
 
       # @return [boolean] true if at least one job was created; false if the call had no effect.
@@ -382,19 +376,24 @@ module Bosh::Director
 
         all_compiled_packages.each do |compiled_package_spec|
           package = compiled_package_spec[:package]
-          stemcell = compiled_package_spec[:stemcell]
+          stemcell = Models::CompiledPackage.split_stemcell_os_and_version(compiled_package_spec[:package_meta]['stemcell'])
           compiled_pkg_tgz = File.join(release_dir, 'compiled_packages', "#{package.name}.tgz")
 
-          existing_compiled_packages = Models::CompiledPackage.where(:package_id => package.id, :stemcell_id => stemcell.id)
-          if existing_compiled_packages.empty?
+          stemcell_os = stemcell[:os]
+          stemcell_version = stemcell[:version]
 
-            package_desc = "#{package.name}/#{package.version} for #{stemcell.name}/#{stemcell.version}"
+          existing_compiled_packages = find_compiled_packages(package.id, stemcell_os, stemcell_version, dependency_key(package))
+
+          if existing_compiled_packages.empty?
+            package_desc = "#{package.name}/#{package.version} for #{stemcell_os}/#{stemcell_version}"
             event_log.track(package_desc) do
-              other_compiled_package = get_other_compiled_package(package, packages_existing_from_other_releases, stemcell)
-              if @fix && !other_compiled_package.nil?
-                fix_compiled_package(other_compiled_package, compiled_pkg_tgz)
+              other_compiled_packages = compiled_packages_matching(package, packages_existing_from_other_releases, stemcell)
+              if @fix
+                other_compiled_packages.each do |other_compiled_package|
+                  fix_compiled_package(other_compiled_package, compiled_pkg_tgz)
+                end
               end
-              create_compiled_package(package, stemcell, release_dir, other_compiled_package)
+              create_compiled_package(package, stemcell_os, stemcell_version, release_dir, other_compiled_packages.first)
               had_effect = true
             end
           elsif @fix
@@ -407,41 +406,21 @@ module Bosh::Director
         had_effect
       end
 
-      def get_other_compiled_package(package, packages_existing_from_other_releases, stemcell)
-        other_compiled_package = nil
+      def compiled_packages_matching(package, packages_existing_from_other_releases, stemcell)
+        other_compiled_packages = []
+        dependency_key = dependency_key(package)
         packages_existing_from_other_releases.each do |other_package_meta|
           if other_package_meta["fingerprint"] == package.fingerprint
             packages = Models::Package.where(fingerprint: other_package_meta["fingerprint"]).all
             packages.each do |pkg|
-              other_compiled_package = Models::CompiledPackage.where(:package_id => pkg.id, :stemcell_id => stemcell.id).first
-              break unless other_compiled_package.nil?
+              other_compiled_packages.concat(find_compiled_packages(pkg.id, stemcell[:os], stemcell[:version], dependency_key).all)
             end
           end
         end
-        other_compiled_package
+        other_compiled_packages
       end
 
-      def stemcells_used_by_package(package_meta)
-        if package_meta['stemcell'].nil?
-          raise 'stemcell informatiom(operating system/version) should be listed for each package of a compiled tarball'
-        end
-
-        values = package_meta['stemcell'].split('/', 2)
-        operating_system = values[0]
-        stemcell_version = values[1]
-        unless operating_system && stemcell_version
-          raise 'stemcell informatiom(operating system/version) should be listed for each package of a compiled tarball'
-        end
-
-        stemcells = Models::Stemcell.where(:operating_system => operating_system, :version => stemcell_version)
-        if stemcells.empty?
-          raise "No stemcells matching OS #{operating_system} version #{stemcell_version}"
-        end
-
-        stemcells
-      end
-
-      def create_compiled_package(package, stemcell, release_dir, other_compiled_package)
+      def create_compiled_package(package, stemcell_os, stemcell_version, release_dir, other_compiled_package)
         if other_compiled_package.nil?
           tgz = File.join(release_dir, 'compiled_packages', "#{package.name}.tgz")
           validate_tgz(tgz, "#{package.name}.tgz")
@@ -455,13 +434,17 @@ module Bosh::Director
         compiled_package = Models::CompiledPackage.new
         compiled_package.blobstore_id = blobstore_id
         compiled_package.sha1 = sha1
+        release_version_model_dependency_key = dependency_key(package)
+        if release_version_model_dependency_key != CompiledRelease::Manifest.new(@manifest).dependency_key(package.name)
+          raise ReleasePackageDependencyKeyMismatch, "The uploaded release contains package dependencies in '#{package.name}' that do not match database records."
+        end
+        compiled_package.dependency_key = release_version_model_dependency_key
 
-        transitive_dependencies = @release_version_model.transitive_dependencies(package)
-        compiled_package.dependency_key = Models::CompiledPackage.create_dependency_key(transitive_dependencies)
-
-        compiled_package.build = Models::CompiledPackage.generate_build_number(package, stemcell)
+        compiled_package.build = Models::CompiledPackage.generate_build_number(package, stemcell_os, stemcell_version)
         compiled_package.package_id = package.id
-        compiled_package.stemcell_id = stemcell.id
+
+        compiled_package.stemcell_os = stemcell_os
+        compiled_package.stemcell_version = stemcell_version
 
         compiled_package.save
       end
@@ -640,6 +623,19 @@ module Bosh::Director
 
       private
 
+      def dependency_key(package)
+        KeyGenerator.new.dependency_key_from_models(package, @release_version_model)
+      end
+
+      def find_compiled_packages(pkg_id, stemcell_os, stemcell_version, dependency_key)
+        Models::CompiledPackage.where(
+            :package_id => pkg_id,
+            :stemcell_os => stemcell_os,
+            :stemcell_version => stemcell_version,
+            :dependency_key => dependency_key
+        )
+      end
+
       # Marks job template model as being used by release version
       # @param [Models::Template] template Job template model
       # @return [void]
@@ -673,8 +669,8 @@ with blobstore_id '#{package.blobstore_id}'")
       def delete_compiled_packages(package)
         package.compiled_packages.each do |compiled_pkg|
           unless BlobUtil.verify_blob(compiled_pkg.blobstore_id, compiled_pkg.sha1)
-            logger.info("Deleting compiled package '#{compiled_pkg.name}' \
-for '#{compiled_pkg.stemcell.name}/#{compiled_pkg.stemcell.version}' with blobstore_id '#{compiled_pkg.blobstore_id}'")
+            logger.info("Deleting compiled package '#{compiled_pkg.name}' for \
+'#{compiled_pkg.stemcell_os}/#{compiled_pkg.stemcell_version}' with blobstore_id '#{compiled_pkg.blobstore_id}'")
             begin
               logger.info("Deleting compiled package '#{compiled_pkg.name}'")
               BlobUtil.delete_blob(compiled_pkg.blobstore_id)
@@ -689,8 +685,8 @@ for '#{compiled_pkg.stemcell.name}/#{compiled_pkg.stemcell.version}' with blobst
 
       def fix_compiled_package(compiled_pkg, compiled_pkg_tgz)
         begin
-          logger.info("Deleting compiled package '#{compiled_pkg.name}/#{compiled_pkg.version}' \
-for '#{compiled_pkg.stemcell.name}/#{compiled_pkg.stemcell.version}' with blobstore_id '#{compiled_pkg.blobstore_id}'")
+          logger.info("Deleting compiled package '#{compiled_pkg.name}/#{compiled_pkg.version}' for \
+'#{compiled_pkg.stemcell_os}/#{compiled_pkg.stemcell_version}' with blobstore_id '#{compiled_pkg.blobstore_id}'")
           BlobUtil.delete_blob compiled_pkg.blobstore_id
         rescue Bosh::Blobstore::BlobstoreError => e
           logger.info("Error deleting compiled package '#{compiled_pkg.name}' \