bosh-director 1.2739.0 → 1.2743.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1eaa338712fc066dfcc8ced60a1e7769c82907c6
-  data.tar.gz: 01db501cba7012e084cd726b1d634bfe0a9eb950
+  metadata.gz: 245617054defdaf1d59d62a2b911b652e0fe0bfd
+  data.tar.gz: 4080e6dd55fee17cd7191966fdba543e23020657
 SHA512:
-  metadata.gz: cb9ea1ab2aa1a58fef2d6f49ca96022b2ce6f9322bfb71a88354867d9af452a0ab5f38dace2e38b015648e12ea12db923e6a812466ffef2f778c3185e558d1d4
-  data.tar.gz: 72f59e8812b850d8dc873862b815780f8dcd6422156f02445c34726656d97fa32cf498c2b699bc39aad64f83323896056e6f734e8688d547904ba97b8cbda4d0
+  metadata.gz: ee0ea8231bbf7a7c7424f774d6dee192daa0ec4bf0a04af82dfbb180abaed049b5942dbb6dfc7ed0db8c980528e7f7bd7cbef816686456acb46837a2aa198107
+  data.tar.gz: 0a1291cad3c5c220f7c06d3ae4f7bc1fdf5125bb8a5d132b570803a2781c6993dc3197d11c3efa9706817ac17c77762357e3fe028f4f2ce5ec30d0e236bcce1e

data/lib/bosh/director/compile_task_generator.rb

@@ -24,19 +24,19 @@ module Bosh::Director
 
       release_version = template.release.model
 
-      task = CompileTask.new(package,
-                             stemcell,
-                             job,
-                             release_version.package_dependency_key(package.name),
-                             release_version.package_cache_key(package.name, stemcell))
+      transitive_dependencies = release_version.transitive_dependencies(package)
+      package_dependency_key = Models::CompiledPackage.create_dependency_key(transitive_dependencies)
+      package_cache_key = Models::CompiledPackage.create_cache_key(package, transitive_dependencies, stemcell)
+
+      task = CompileTask.new(package, stemcell, job, package_dependency_key, package_cache_key)
 
       compiled_package = task.find_compiled_package(@logger, @event_log)
       if compiled_package
         task.use_compiled_package(compiled_package)
       end
 
-        @logger.info("Processing package `#{package.desc}' dependencies")
-      dependencies = release_version.dependencies(package.name)
+      @logger.info("Processing package `#{package.desc}' dependencies")
+      dependencies = release_version.dependencies(package)
       dependencies.each do |dependency|
         @logger.info("Package `#{package.desc}' depends on package `#{dependency.desc}'")
         dependency_task = generate!(compile_tasks, job, template, dependency, stemcell)

data/lib/bosh/director/compiled_package/compiled_package_inserter.rb

@@ -12,10 +12,13 @@ module Bosh::Director::CompiledPackage
 
       stemcell = Bosh::Director::Models::Stemcell[sha1: compiled_package.stemcell_sha1]
 
+      transitive_dependencies = release_version.transitive_dependencies(package)
+      package_dependency_key = Bosh::Director::Models::CompiledPackage.create_dependency_key(transitive_dependencies)
+
       compiled_package_model = Bosh::Director::Models::CompiledPackage[
         package: package,
         stemcell: stemcell,
-        dependency_key: release_version.package_dependency_key(package.name),
+        dependency_key: package_dependency_key,
       ]
 
       return if compiled_package_model
@@ -30,7 +33,7 @@ module Bosh::Director::CompiledPackage
           package: package,
           stemcell: stemcell,
           sha1: compiled_package.sha1,
-          dependency_key: release_version.package_dependency_key(package.name),
+          dependency_key: package_dependency_key,
           build: Bosh::Director::Models::CompiledPackage.generate_build_number(package, stemcell),
         )
       rescue

data/lib/bosh/director/compiled_package_group.rb

@@ -7,10 +7,12 @@ module Bosh::Director
 
     def compiled_packages
       @compiled_packages ||= @release_version.packages.map do |package|
+        transitive_dependencies = @release_version.transitive_dependencies(package)
+        package_dependency_key = Bosh::Director::Models::CompiledPackage.create_dependency_key(transitive_dependencies)
         Models::CompiledPackage[
           :package_id => package.id,
           :stemcell_id => @stemcell.id,
-          :dependency_key => @release_version.package_dependency_key(package.name)
+          :dependency_key => package_dependency_key
         ]
       end.compact
     end

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

@@ -176,22 +176,18 @@ module Bosh::Director
           packages_by_name[package["name"]] = package
           package["dependencies"] ||= []
         end
+        logger.info("Resolving package dependencies for #{packages_by_name.keys.inspect}")
+
         dependency_lookup = lambda do |package_name|
           packages_by_name[package_name]["dependencies"]
         end
-        result = CycleHelper.check_for_cycle(packages_by_name.keys,
-                                             :connected_vertices => true,
-                                             &dependency_lookup)
+        result = Bosh::Director::CycleHelper.check_for_cycle(packages_by_name.keys, :connected_vertices => true, &dependency_lookup)
 
         packages.each do |package|
           name = package["name"]
           dependencies = package["dependencies"]
-
-          logger.info("Resolving package dependencies for `#{name}', " +
-                      "found: #{dependencies.pretty_inspect}")
-          package["dependencies"] = result[:connected_vertices][name]
-          logger.info("Resolved package dependencies for `#{name}', " +
-                      "to: #{dependencies.pretty_inspect}")
+          all_dependencies = result[:connected_vertices][name]
+          logger.info("Resolved package dependencies for `#{name}': #{dependencies.pretty_inspect} => #{all_dependencies.pretty_inspect}")
         end
       end
 
@@ -222,9 +218,17 @@ module Bosh::Director
           end
 
           if existing_package
+            # clean up 'broken' dependency_set (a bug was including transitives)
+            # dependency ordering impacts fingerprint
+            # TODO: The following code can be removed after some reasonable time period (added 2014.10.06)
+            if existing_package.dependency_set != package_meta['dependencies']
+              existing_package.dependency_set = package_meta['dependencies']
+              existing_package.save
+            end
+
             existing_packages << [existing_package, package_meta]
           else
-            # We found a package with the same checksum but different
+            # We found a package with the same fingerprint but different
             # (release, name, version) tuple, so we need to make a copy
             # of the package blob and create a new db entry for it
             package = packages.first

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

@@ -1,13 +1,24 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director::Models
   class CompiledPackage < Sequel::Model(Bosh::Director::Config.db)
     many_to_one :package
     many_to_one :stemcell
 
+    # Creates a dependency_key from a list of dependencies
+    # Input MUST include immediate & transitive dependencies
+    def self.create_dependency_key(transitive_dependencies)
+      key = transitive_dependencies.to_a.sort_by(&:name).map { |p| [p.name, p.version]}
+      Yajl::Encoder.encode(key)
+    end
+
+    # Creates a 'unique' key to use in the global package cache
+    def self.create_cache_key(package, transitive_dependencies, stemcell)
+      dependency_fingerprints = transitive_dependencies.to_a.sort_by(&:name).map {|p| p.fingerprint }
+      hash_input = ([package.fingerprint, stemcell.sha1]+dependency_fingerprints).join('')
+      Digest::SHA1.hexdigest(hash_input)
+    end
+
     def validate
-      validates_presence [:package_id, :stemcell_id, :sha1,
-                          :blobstore_id, :dependency_key]
+      validates_presence [:package_id, :stemcell_id, :sha1, :blobstore_id, :dependency_key]
       validates_unique [:package_id, :stemcell_id, :dependency_key]
       validates_unique [:package_id, :stemcell_id, :build]
     end

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

@@ -11,34 +11,30 @@ module Bosh::Director::Models
       validates_unique [:release_id, :version]
     end
 
-    def dependencies(package_name)
-      package_by_name(package_name).dependency_set.map do |package_name|
-        package_by_name(package_name)
+    # immediate dependency models
+    def dependencies(package)
+      package.dependency_set.map { |package_name| package_by_name(package_name) }.to_set
+    end
+
+    # all dependency models, including transitives
+    # assumes there are no cycles (checked during upload)
+    def transitive_dependencies(package)
+      dependency_set = Set.new
+      dependencies(package).each do |dependency|
+        dependency_set << dependency
+        dependency_set.merge(transitive_dependencies(dependency))
       end
+      dependency_set
     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|
+      @packages_by_name_cache ||= packages.inject({}) do |cache, package|
         cache.merge(package.name => package)
       end
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2739.0'
+    VERSION = '1.2743.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2739.0
+  version: 1.2743.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-09 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2739.0
+        version: 1.2743.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +422,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: semi_semantic
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  0d77bd
+  01851c
 email: support@cloudfoundry.com
 executables:
 - bosh-director