bosh-director 1.3112.0 → 1.3115.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b04d4dfc4ecd3f8ea16a604286d10d6fd3fceb3e
-  data.tar.gz: 1f14af1610053a8d44b84849629368503e092a13
+  metadata.gz: 55328ec9d042beefb1bf840777ea01ef3e2f22ed
+  data.tar.gz: d2af38792bd179f949e3cf79c9dab94ef12de2e6
 SHA512:
-  metadata.gz: 330916a2acaac730ba63b36c10fefeae40ca48c2d5254ce2050c2c9bd1b118c901c076a999f48ec9d9d5d5c24425a84cce413ad706b1e8dcb474110f19b5260f
-  data.tar.gz: 132b5cdf46faba85d1462093b9f8abebb8813ff62835c7da8cea8836bae724a99ecbd7c0026aec24bec42b3a0df075383e4b3759a3743fa728e8fd2e322b2823
+  metadata.gz: 09953e2a0f95ea0da277f98ee89948b740e0b40c286cb1585128a91848a47662d30e97da9eb1ca4e34d646b58905d9f2f8ae4ba0889b9d2a34e1183854e07f3e
+  data.tar.gz: e8afa094deb406029e902b414e852212c9f384d6e015a122baee7ae4fe31ebb3b38a29288aa440919cb763ff54e0a57475edd0a85a1101f06e02a3d15abcd89e

data/lib/bosh/director/api/controllers/packages_controller.rb

@@ -29,15 +29,61 @@ module Bosh::Director
         end
 
         fingerprint_list = []
-
         manifest['compiled_packages'].each do |package|
           fingerprint_list << package['fingerprint'] if package['fingerprint']
         end
 
-        matching_packages = Models::Package.join(Models::CompiledPackage, :package_id=>:id).where(fingerprint: fingerprint_list).all
+        matching_packages = Models::Package.join(Models::CompiledPackage, :package_id=>:id)
+                                .select(:packages__name, :packages__fingerprint, :compiled_packages__dependency_key, :stemcells__operating_system, :stemcells__version)
+                                .join(Models::Stemcell, :id=>:stemcell_id)
+                                .where(fingerprint: fingerprint_list).all
+
+        matching_packages = filter_matching_packages(matching_packages, manifest)
 
         json_encode(matching_packages.map(&:fingerprint).compact.uniq)
       end
+
+      # dependencies & stemcell should also match
+      def filter_matching_packages(matching_packages, manifest)
+        filtered_packages = []
+
+        matching_packages.each do |package|
+          stemcell_match = "#{package[:operating_system]}/#{package[:version]}" == compiled_package_meta(package.name, manifest)['stemcell']
+          dependencies_match = package[:dependency_key] == dependency_key(package, manifest)
+
+          if stemcell_match && dependencies_match
+            filtered_packages << package
+          end
+        end
+
+        filtered_packages
+      end
+
+      def dependency_key(package, manifest)
+        compiled_package_meta = compiled_package_meta(package.name, manifest)
+        dependencies = transitive_dependencies(compiled_package_meta, manifest)
+
+        key = dependencies.to_a.sort_by {|k| k["name"]}.map { |p| [p['name'], p['version']]}
+        Yajl::Encoder.encode(key)
+      end
+
+      def transitive_dependencies(compiled_package_meta, manifest)
+        dependencies = Set.new
+        return dependencies if compiled_package_meta['dependencies'].nil?
+
+        compiled_package_meta['dependencies'].each do |dependency_package_name|
+          dependency_compiled_package_meta = compiled_package_meta(dependency_package_name, manifest)
+          dependencies << dependency_compiled_package_meta
+          dependencies.merge(transitive_dependencies(dependency_compiled_package_meta, manifest))
+        end
+
+        dependencies
+      end
+
+      def compiled_package_meta(package_name, manifest)
+        manifest['compiled_packages'].select { |p| p['name'] == package_name}[0]
+      end
+
     end
   end
 end

data/lib/bosh/director/config.rb

@@ -34,6 +34,7 @@ module Bosh::Director
         :enable_snapshots,
         :max_vm_create_tries,
         :nats_uri,
+        :default_ssh_options
       )
 
       attr_reader(
@@ -121,6 +122,8 @@ module Bosh::Director
         @process_uuid = SecureRandom.uuid
         @nats_uri = config['mbus']
 
+        @default_ssh_options = config['default_ssh_options']
+
         @cloud_options = config['cloud']
         @compiled_package_cache_options = config['compiled_package_cache']
         @name = config['name'] || ''

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

@@ -45,6 +45,11 @@ module Bosh::Director
           result = agent.ssh(@command, @params)
           result["index"] = instance.index
 
+          if Config.default_ssh_options
+            result["gateway_host"] = Config.default_ssh_options["gateway_host"]
+            result["gateway_user"] = Config.default_ssh_options["gateway_user"]
+          end
+
           result
         end
 

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

@@ -192,6 +192,7 @@ module Bosh::Director
         new_packages = []
         existing_packages = []
         registered_packages = []
+        packages_existing_from_other_releases = []
 
         @manifest[@packages_folder].each do |package_meta|
           # Checking whether we might have the same bits somewhere (in any release, not just the one being uploaded)
@@ -242,7 +243,6 @@ module Bosh::Director
             # 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
-
             packages.each do |package|
               unless package.blobstore_id.nil?
                 package_meta["blobstore_id"] = package.blobstore_id
@@ -251,6 +251,7 @@ module Bosh::Director
               end
             end
             new_packages << package_meta
+            packages_existing_from_other_releases << package_meta
           end
         end
 
@@ -268,7 +269,7 @@ module Bosh::Director
             end
           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)
+          create_compiled_packages(consolidated_package_stemcell_hashes, release_dir, packages_existing_from_other_releases)
         else
           backfill_source_for_packages(registered_packages, release_dir)
         end
@@ -361,31 +362,45 @@ module Bosh::Director
       end
 
       # @return [boolean] true if at least one job was created; false if the call had no effect.
-      def create_compiled_packages(all_compiled_packages, release_dir)
+      def create_compiled_packages(all_compiled_packages, release_dir, packages_existing_from_other_releases)
         return false if all_compiled_packages.nil?
 
         event_log.begin_stage('Creating new compiled packages', all_compiled_packages.size)
-
         had_effect = false
+
         all_compiled_packages.each do |compiled_package_spec|
           package = compiled_package_spec[:package]
           stemcell = compiled_package_spec[:stemcell]
 
-          existing_compiled_package = Models::CompiledPackage.where(
-              :package_id => package.id,
-              :stemcell_id => stemcell.id)
-
+          existing_compiled_package = Models::CompiledPackage.where(:package_id => package.id, :stemcell_id => stemcell.id)
           if existing_compiled_package.empty?
+
             package_desc = "#{package.name}/#{package.version} for #{stemcell.name}/#{stemcell.version}"
             event_log.track(package_desc) do
-              create_compiled_package(package, stemcell, release_dir)
+              other_compiled_package = get_other_compiled_package(package, packages_existing_from_other_releases, stemcell)
+              create_compiled_package(package, stemcell, release_dir, other_compiled_package)
               had_effect = true
             end
           end
         end
+
         had_effect
       end
 
+      def get_other_compiled_package(package, packages_existing_from_other_releases, stemcell)
+        other_compiled_package = nil
+        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?
+            end
+          end
+        end
+        other_compiled_package
+      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'
@@ -406,14 +421,21 @@ module Bosh::Director
         stemcells
       end
 
-      def create_compiled_package(package, stemcell, release_dir)
-        tgz = File.join(release_dir, 'compiled_packages', "#{package.name}.tgz")
-        validate_tgz(tgz, "#{package.name}.tgz")
+      def create_compiled_package(package, stemcell, 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")
 
-        compiled_package = Models::CompiledPackage.new
+          blobstore_id = BlobUtil.create_blob(tgz)
+          sha1 = Digest::SHA1.file(tgz).hexdigest
+        else
+          blobstore_id = BlobUtil.copy_blob(other_compiled_package.blobstore_id)
+          sha1 = other_compiled_package.sha1
+        end
 
-        compiled_package.blobstore_id = BlobUtil.create_blob(tgz)
-        compiled_package.sha1 = Digest::SHA1.file(tgz).hexdigest
+        compiled_package = Models::CompiledPackage.new
+        compiled_package.blobstore_id = blobstore_id
+        compiled_package.sha1 = sha1
 
         transitive_dependencies = @release_version_model.transitive_dependencies(package)
         compiled_package.dependency_key = Models::CompiledPackage.create_dependency_key(transitive_dependencies)

data/lib/bosh/director/problem_resolver.rb

@@ -45,6 +45,8 @@ module Bosh::Director
       @resolved_count
     end
 
+    private
+
     def apply_resolution(problem)
       handler = ProblemHandlers::Base.create_from_model(problem)
       handler.job = self

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3112.0'
+    VERSION = '1.3115.0'
   end
 end

metadata

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