bosh-director 1.5.0.pre.1168 → 1.5.0.pre.1172

data/lib/bosh/director/compile_task.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   class CompileTask
     # @return [Models::Package] What package is being compiled
@@ -27,23 +25,18 @@ module Bosh::Director
     # @return [String] A unique checksum based on the dependencies in this task
     attr_reader :cache_key
 
-    # @param [Models::Package] package What package is being compiled
-    #   by this task
-    # @param [Models::Stemcell] stemcell What stemcell package is compiled for
-    # @param [Array<Models::Package>] dependent_packages Package models that this task depends on
-    # @param [DeploymentPlan::Job] initial_job The first job that this task is associate with
-    def initialize(package, stemcell, dependent_packages, initial_job = nil)
+
+    def initialize(package, stemcell, initial_job, dependency_key, cache_key)
       @package = package
       @stemcell = stemcell
 
       @jobs = []
-      add_job(initial_job) if initial_job
+      add_job(initial_job)
       @dependencies = []
       @dependent_tasks = []
 
-      @dependency_key = generate_dependency_key(dependent_packages)
-
-      @cache_key = generate_cache_key(dependent_packages)
+      @dependency_key = dependency_key
+      @cache_key = cache_key
     end
 
     # @return [Boolean] Whether this task is ready to be compiled
@@ -172,20 +165,5 @@ module Bosh::Director
 
       compiled_package
     end
-
-    private
-    def generate_dependency_key(packages)
-      key = packages.sort { |a, b|
-        a.name <=> b.name
-      }.map { |p| [p.name, p.version]}
-
-      Yajl::Encoder.encode(key)
-    end
-
-    def generate_cache_key(dependent_packages)
-      dependency_fingerprints = dependent_packages.sort_by(&:name).map {|p| p.fingerprint }
-      hash_input = ([package.fingerprint, stemcell.sha1]+dependency_fingerprints).join("")
-      Digest::SHA1.hexdigest(hash_input)
-    end
   end
 end

data/lib/bosh/director/deployment_plan.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
   end
@@ -15,7 +13,7 @@ require 'bosh/director/deployment_plan/compiled_package'
 require 'bosh/director/deployment_plan/preparer'
 require 'bosh/director/deployment_plan/resource_pools'
 require 'bosh/director/deployment_plan/updater'
-require 'bosh/director/deployment_plan/release'
+require 'bosh/director/deployment_plan/release_version'
 require 'bosh/director/deployment_plan/resource_pool'
 require 'bosh/director/deployment_plan/stemcell'
 require 'bosh/director/deployment_plan/template'

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

@@ -30,7 +30,7 @@ module Bosh::Director
       # @return [DeploymentPlan] Current deployment plan
       attr_accessor :deployment
 
-      # @return [DeploymentPlan::Release] Release this job belongs to
+      # @return [DeploymentPlan::ReleaseVersion] Release this job belongs to
       attr_accessor :release
 
       # @return [DeploymentPlan::ResourcePool] Resource pool this job should

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

@@ -122,13 +122,13 @@ module Bosh::Director
       end
 
       # Returns all releases in a deployment plan
-      # @return [Array<Bosh::Director::DeploymentPlan::Release>]
+      # @return [Array<Bosh::Director::DeploymentPlan::ReleaseVersion>]
       def releases
         @releases.values
       end
 
       # Returns a named release
-      # @return [Bosh::Director::DeploymentPlan::Release]
+      # @return [Bosh::Director::DeploymentPlan::ReleaseVersion]
       def release(name)
         @releases[name]
       end
@@ -182,7 +182,7 @@ module Bosh::Director
 
         @releases = {}
         release_specs.each do |release_spec|
-          release = Release.new(self, release_spec)
+          release = ReleaseVersion.new(self, release_spec)
           if @releases.has_key?(release.name)
             raise DeploymentDuplicateReleaseName,
                   "Duplicate release name `#{release.name}'"

data/lib/bosh/director/deployment_plan/{release.rb → release_version.rb}

@@ -1,8 +1,6 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
-    class Release
+    class ReleaseVersion
       include ValidationHelper
 
       # @return [String] Release name
@@ -18,8 +16,8 @@ module Bosh::Director
       def initialize(deployment_plan, spec)
         @deployment_plan = deployment_plan
 
-        @name = safe_property(spec, "name", :class => String)
-        @version = safe_property(spec, "version", :class => String)
+        @name = safe_property(spec, 'name', :class => String)
+        @version = safe_property(spec, 'version', :class => String)
 
         @model = nil
         @templates = {}
@@ -33,7 +31,7 @@ module Bosh::Director
       def bind_model
         deployment = @deployment_plan.model
         if deployment.nil?
-          raise DirectorError, "Deployment not bound in the deployment plan"
+          raise DirectorError, 'Deployment not bound in the deployment plan'
         end
 
         release = @manager.find_by_name(@name)
@@ -51,10 +49,10 @@ module Bosh::Director
       # release spec
       # @return [void]
       def bind_templates
-        # Release version model needs to be known so we can look up its
+        # ReleaseVersion model needs to be known so we can look up its
         # templates
         if @model.nil?
-          raise DirectorError, "Release model not bound in release spec"
+          raise DirectorError, 'ReleaseVersion model not bound in release spec'
         end
 
         # By now job specs from the deployment manifest should
@@ -70,8 +68,8 @@ module Bosh::Director
       # @return [Hash] Hash representation
       def spec
         {
-          "name" => @name,
-          "version" => @version
+          'name' => @name,
+          'version' => @version
         }
       end
 
@@ -91,12 +89,7 @@ module Bosh::Director
       # @param [String] name Package name
       # @return [Models::Package]
       def get_package_model_by_name(name)
-        @all_packages ||= @model.packages.inject({}) do |hash, package|
-          hash[package.name] = package
-          hash
-        end
-
-        @all_packages[name]
+        @model.package_by_name(name)
       end
 
       # Adds template to a list of templates used by this release for the

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

@@ -10,7 +10,7 @@ module Bosh::Director
       attr_reader :model
       attr_reader :package_models
 
-      # @param [DeploymentPlan::Release] release Release
+      # @param [DeploymentPlan::ReleaseVersion] release Release version
       # @param [String] name Template name
       def initialize(release, name)
         @release = release

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

@@ -173,7 +173,7 @@ module Bosh::Director
             unless deployments.empty?
               names = deployments.map{ |d| d.name }.join(", ")
               raise ReleaseVersionInUse,
-                    "Release version `#{desc}' is still in use by: #{names}"
+                    "ReleaseVersion `#{desc}' is still in use by: #{names}"
             end
 
             delete_release_version(release_version)

data/lib/bosh/director/models/release_version.rb

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director::Models
   class ReleaseVersion < Sequel::Model(Bosh::Director::Config.db)
     many_to_one  :release
@@ -12,5 +10,37 @@ module Bosh::Director::Models
       validates_unique [:release_id, :version]
       validates_format VALID_ID, :version
     end
+
+    def dependencies(package_name)
+      package_by_name(package_name).dependency_set.map do |package_name|
+        package_by_name(package_name)
+      end
+    end
+
+    def package_by_name(package_name)
+      packages_by_name.fetch(package_name)
+    end
+
+    def package_dependency_key(package_name)
+      key = dependencies(package_name).sort { |a, b|
+        a.name <=> b.name
+      }.map { |p| [p.name, p.version]}
+
+      Yajl::Encoder.encode(key)
+    end
+
+    def package_cache_key(package_name, stemcell)
+      dependency_fingerprints = dependencies(package_name).sort_by(&:name).map {|p| p.fingerprint }
+      hash_input = ([package_by_name(package_name).fingerprint, stemcell.sha1]+dependency_fingerprints).join("")
+      Digest::SHA1.hexdigest(hash_input)
+    end
+
+    private
+
+    def packages_by_name
+      @packages_by_name ||= packages.inject({}) do |cache, package|
+        cache.merge(package.name => package)
+      end
+    end
   end
 end

data/lib/bosh/director/package_compiler.rb

@@ -211,11 +211,13 @@ module Bosh::Director
         return task
       end
 
-      dependencies = package.dependency_set.map do |name|
-        job.release.get_package_model_by_name(name)
-      end
+      release_version = job.release.model
 
-      task = CompileTask.new(package, stemcell, dependencies, job)
+      task = CompileTask.new(package,
+                             stemcell,
+                             job,
+                             release_version.package_dependency_key(package.name),
+                             release_version.package_cache_key(package.name, stemcell))
 
       compiled_package = task.find_compiled_package(@logger, @event_log)
       if compiled_package
@@ -223,6 +225,7 @@ module Bosh::Director
       end
 
       @logger.info("Processing package `#{package.desc}' dependencies")
+      dependencies = release_version.dependencies(package.name)
       dependencies.each do |dependency|
         @logger.info("Package `#{package.desc}' depends on package `#{dependency.desc}'")
         dependency_task = generate_compile_task(job, dependency, stemcell)

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1168'
+    VERSION = '1.5.0.pre.1172'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1168
+  version: 1.5.0.pre.1172
   prerelease: 6
 platform: ruby
 authors:
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1168
+        version: 1.5.0.pre.1172
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  196847'
+  d74fd2'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -548,7 +548,7 @@ files:
 - lib/bosh/director/deployment_plan/network_subnet.rb
 - lib/bosh/director/deployment_plan/planner.rb
 - lib/bosh/director/deployment_plan/preparer.rb
-- lib/bosh/director/deployment_plan/release.rb
+- lib/bosh/director/deployment_plan/release_version.rb
 - lib/bosh/director/deployment_plan/resource_pool.rb
 - lib/bosh/director/deployment_plan/resource_pools.rb
 - lib/bosh/director/deployment_plan/stemcell.rb