bosh-director 1.3033.0 → 1.3039.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e33d9d02e1fdad6c921fef85eba81325457d783a
-  data.tar.gz: 02ec8b58afd26b564f75b1bce643124c8ccc422f
+  metadata.gz: e1c9c98a013230e8d0555c8b260168f1fc0c9093
+  data.tar.gz: 9cb640f2ae37516b36760f377488b7043f612540
 SHA512:
-  metadata.gz: 69ccd932a27ee4003922bd34dba420ba5af82c6fe763ee79ddcfd375e2cf91ea93c68a28aa078440e22c1f313a00987164faf0059ab974a7f5ba5d3c4e2de3d2
-  data.tar.gz: d311220b9905560bdafa4c6414dee1e4f76394bbf9ff378c472c5b07079f79e2ab0a218523c3fab24d3dedcb0c719b4d712b2ed6fb5f453467dc230b4b3f0ed9
+  metadata.gz: 481c63da02db2398df3d2a57b6ab6e4b9aecc455db3a0eb92dda84c0608e023edaadbc93e13f3a8f4cf72fac1e8bcb72d615f5c77597da57d8a8e6267d5caac7
+  data.tar.gz: b0744f35130ef2545dbbb72da03aa01fe4380baf6c2ecd544538934a98b627f926d0c433de93f3d4f6f77d70216e152863f6f0185dad187e0b347dddd3346c07

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

@@ -48,7 +48,7 @@ module Bosh::Director
         redirect "/tasks/#{task.id}"
       end
 
-      # PUT /deployments/foo/jobs/dea/2?state={started,stopped,detached,restart,recreate}
+      # PUT /deployments/foo/jobs/dea/2?state={started,stopped,detached,restart,recreate}&skip_drain=true
       put '/:deployment/jobs/:job/:index', :consumes => :yaml do
         begin
           index = Integer(params[:index])
@@ -61,9 +61,10 @@ module Bosh::Director
             params[:job] => {
               'instance_states' => {
                 index => params['state']
-              }
+              },
             }
-          }
+          },
+          'skip_drain' => params[:job]
         }
 
         deployment = @deployment_manager.find_by_name(params[:deployment])
@@ -269,6 +270,7 @@ module Bosh::Director
       post '/', :consumes => :yaml do
         options = {}
         options['recreate'] = true if params['recreate'] == 'true'
+        options['skip_drain'] = params['skip_drain'] if params['skip_drain']
         latest_cloud_config = Bosh::Director::Api::CloudConfigManager.new.latest
 
         task = @deployment_manager.create_deployment(current_user, request.body, latest_cloud_config, options)
@@ -313,7 +315,6 @@ module Bosh::Director
         planner_factory.planner_without_vm_binding(manifest_hash, cloud_config_model, {})
       end
 
-
       def convert_job_instance_hash(hash)
         hash.reduce([]) do |jobs, kv|
           job, indicies = kv

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

@@ -60,6 +60,11 @@ module Bosh::Director
 
       get '/:name', scope: :read do
         name = params[:name].to_s.strip
+
+        if params['version']
+          return inspect_release(name, params['version'])
+        end
+
         release = @release_manager.find_by_name(name)
 
         result = { }
@@ -100,6 +105,44 @@ module Bosh::Director
         task = @release_manager.delete_release(current_user, release, options)
         redirect "/tasks/#{task.id}"
       end
+
+      private
+
+      def inspect_release(name, version)
+        release = @release_manager.find_by_name(name)
+        release_version = @release_manager.find_version(release, version)
+
+        result = { }
+
+        result['jobs'] = release_version.templates.sort_by { |t| t.name }.map do |template|
+          {
+              'name' => template.name,
+              'blobstore_id' => template.blobstore_id,
+              'sha1' => template.sha1,
+              'fingerprint' => template.fingerprint.to_s,
+          }
+        end
+
+        result['packages'] = release_version.packages.sort_by { |p| p.name }.map do |package|
+          {
+              'name' => package.name,
+              'blobstore_id' => package.blobstore_id,
+              'sha1' => package.sha1,
+              'fingerprint' => package.fingerprint.to_s,
+              'compiled_packages' => package.compiled_packages.sort_by { |cp| cp.stemcell }.map do |compiled|
+                {
+                    'stemcell' => "#{compiled.stemcell.name}/#{compiled.stemcell.version}",
+                    'sha1' => compiled.sha1,
+                    'blobstore_id' => compiled.blobstore_id,
+                }
+              end
+          }
+        end
+
+        content_type(:json)
+        json_encode(result)
+      end
+
     end
   end
 end

data/lib/bosh/director/compiled_release_downloader.rb

@@ -16,20 +16,30 @@ module Bosh::Director
       path = File.join(@download_dir, 'compiled_packages')
       FileUtils.mkpath(path)
 
-      @compiled_packages_group.compiled_packages.each do |compiled_package|
-        blobstore_id = compiled_package.blobstore_id
-        File.open(File.join(path, "#{compiled_package.package.name}.tgz"), 'w') do |f|
-          @blobstore_client.get(blobstore_id, f, sha1: compiled_package.sha1)
+      compiled_packages = @compiled_packages_group.compiled_packages
+      event_log.begin_stage("copying packages", compiled_packages.count)
+
+      compiled_packages.each do |compiled_package|
+        desc = "#{compiled_package.package.name}/#{compiled_package.package.version}"
+        event_log.track(desc) do
+          blobstore_id = compiled_package.blobstore_id
+          File.open(File.join(path, "#{compiled_package.package.name}.tgz"), 'w') do |f|
+            @blobstore_client.get(blobstore_id, f, sha1: compiled_package.sha1)
+          end
         end
       end
 
       path = File.join(@download_dir, 'jobs')
       FileUtils.mkpath(path)
 
+      event_log.begin_stage("copying jobs", @templates.count)
       @templates.each do |template|
-        blobstore_id = template.blobstore_id
-        File.open(File.join(path, "#{template.name}.tgz"), 'w') do |f|
-          @blobstore_client.get(blobstore_id, f, sha1: template.sha1)
+        desc = "#{template.name}/#{template.version}"
+        event_log.track(desc) do
+          blobstore_id = template.blobstore_id
+          File.open(File.join(path, "#{template.name}.tgz"), 'w') do |f|
+            @blobstore_client.get(blobstore_id, f, sha1: template.sha1)
+          end
         end
       end
 
@@ -39,5 +49,10 @@ module Bosh::Director
     def cleanup
       FileUtils.rm_rf(@download_dir)
     end
+
+    def event_log
+      @event_log ||= Config.event_log
+    end
+
   end
 end

data/lib/bosh/director/compiled_release_manifest.rb

@@ -51,7 +51,15 @@ module Bosh::Director
     end
 
     def write(dest_path)
-      File.open(dest_path, 'w') { |f| f.write(YAML.dump(generate_manifest)) }
+      manifest = generate_manifest
+      manifest_yaml = YAML.dump(manifest)
+      logger.debug("release.MF contents of #{manifest['name']}/#{manifest['version']} compiled release tarball:\n " + manifest_yaml)
+      File.open(dest_path, 'w') { |f| f.write(manifest_yaml) }
     end
+
+    def logger
+      @logger ||= Config.logger
+    end
+
   end
 end

data/lib/bosh/director/config.rb

@@ -36,7 +36,11 @@ module Bosh::Director
         :nats_uri,
       )
 
-      attr_reader :db_config, :redis_logger_level
+      attr_reader(
+        :db_config,
+        :redis_logger_level,
+        :ignore_missing_gateway
+      )
 
       def clear
         self.instance_variables.each do |ivar|
@@ -141,6 +145,7 @@ module Bosh::Director
         @enable_snapshots = config.fetch('snapshots', {}).fetch('enabled', false)
 
         @trusted_certs = config['trusted_certs'] || ''
+        @ignore_missing_gateway = config['ignore_missing_gateway']
 
         Bosh::Clouds::Config.configure(self)
 
@@ -171,7 +176,12 @@ module Bosh::Director
         db_config = db_config.merge(connection_options)
 
         db = Sequel.connect(db_config)
-        db.extension :connection_validator
+
+        Bosh::Common.retryable(sleep: 0.5, tries: 20, on: [Exception]) do
+          db.extension :connection_validator
+          true
+        end
+
         db.pool.connection_validation_timeout = -1
         if logger
           db.logger = logger

data/lib/bosh/director/deployment_plan.rb

@@ -30,3 +30,4 @@ require 'bosh/director/deployment_plan/assembler'
 require 'bosh/director/deployment_plan/planner_factory'
 require 'bosh/director/deployment_plan/manifest_migrator'
 require 'bosh/director/deployment_plan/deployment_repo'
+require 'bosh/director/deployment_plan/options/skip_drain'

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

@@ -43,7 +43,8 @@ module Bosh::Director
         network_id = @range.network(:Objectify => true)
         broadcast = @range.broadcast(:Objectify => true)
 
-        gateway_property = safe_property(subnet_spec, "gateway", class: String)
+        ignore_missing_gateway = Bosh::Director::Config.ignore_missing_gateway
+        gateway_property = safe_property(subnet_spec, "gateway", class: String, optional: ignore_missing_gateway)
         if gateway_property
           @gateway = NetAddr::CIDR.create(gateway_property)
           unless @gateway.size == 1

data/lib/bosh/director/deployment_plan/options/skip_drain.rb

@@ -0,0 +1,20 @@
+module Bosh::Director
+  module DeploymentPlan
+    class SkipDrain
+      def initialize(param)
+        @jobs = []
+        @all = false
+
+        if param == '*'
+          @all = true
+        elsif param.is_a?(String) && !param.empty?
+          @jobs = param.split(',')
+        end
+      end
+
+      def for_job(job_name)
+        @all || @jobs.include?(job_name)
+      end
+    end
+  end
+end

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

@@ -45,6 +45,9 @@ module Bosh::Director
       # @return [Boolean] Indicates whether VMs should be recreated
       attr_reader :recreate
 
+      # @return [Boolean] Indicates whether VMs should be drained
+      attr_reader :skip_drain
+
       def initialize(attrs, manifest_text, cloud_config, deployment_model, options = {})
         @name = attrs.fetch(:name)
         @properties = attrs.fetch(:properties)
@@ -67,6 +70,7 @@ module Bosh::Director
           :class => Hash, :default => {})
 
         @recreate = !!options['recreate']
+        @skip_drain = SkipDrain.new(options['skip_drain'])
       end
 
       def_delegators :@cloud_planner, :add_network, :networks, :network,
@@ -84,6 +88,10 @@ module Bosh::Director
         @model.vms
       end
 
+      def skip_drain_for_job?(name)
+        @skip_drain.nil? ? false : @skip_drain.for_job(name)
+      end
+
       # Adds a release by name
       # @param [Bosh::Director::DeploymentPlan::ReleaseVersion] release
       def add_release(release)

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

@@ -56,6 +56,32 @@ module Bosh
           assemble_without_vm_binding(attrs, deployment_manifest, cloud_manifest, deployment_model, cloud_config, options)
         end
 
+        def self.validate_packages(planner, options)
+          release_manager = Bosh::Director::Api::ReleaseManager.new
+          planner.jobs.each { |job|
+            job.templates.each{ |template|
+              release_model = release_manager.find_by_name(template.release.name)
+              template.package_models.each{ |package|
+
+                release_version_model = release_manager.find_version(release_model, template.release.version)
+                packages_list = release_version_model.transitive_dependencies(package)
+                packages_list << package
+
+                packages_list.each { |needed_package|
+                  if needed_package.sha1.nil? || needed_package.blobstore_id.nil?
+                    compiled_packages_list = Bosh::Director::Models::CompiledPackage[:package_id => needed_package.id, :stemcell_id => job.resource_pool.stemcell.model.id]
+                    if compiled_packages_list.nil?
+                      msg = "Can't #{options[:context]} `#{release_version_model.release.name}/#{release_version_model.version}': it is not " +
+                          "compiled for `#{job.resource_pool.stemcell.model.desc}' and no source package is available"
+                      raise PackageMissingSourceCode, msg
+                    end
+                  end
+                }
+              }
+            }
+          }
+        end
+
         private
 
         def deployment_name(manifest_hash)
@@ -66,11 +92,12 @@ module Bosh
         def assemble_without_vm_binding(attrs, deployment_manifest, cloud_manifest, deployment_model, cloud_config, options)
           plan_options = {
             'recreate' => !!options['recreate'],
+            'skip_drain' => options['skip_drain'],
             'job_states' => options['job_states'] || {},
             'job_rename' => options['job_rename'] || {}
           }
           @logger.info('Creating deployment plan')
-          @logger.info("Deployment plan options: #{plan_options.pretty_inspect}")
+          @logger.info("Deployment plan options: #{plan_options}")
 
           deployment = Planner.new(attrs, deployment_manifest, cloud_config, deployment_model, plan_options)
           deployment = CloudManifestParser.new(deployment, @logger).parse(cloud_manifest)
@@ -94,7 +121,7 @@ module Bosh
 
           run_prepare_step(assembler)
 
-          validate_packages(planner)
+          self.class.validate_packages(planner, {:context => 'deploy'})
 
           DeploymentPlan::Steps::PackageCompileStep.new(
             planner,
@@ -148,32 +175,6 @@ module Bosh
           end
         end
 
-        def validate_packages(planner)
-          release_manager = Bosh::Director::Api::ReleaseManager.new
-          planner.jobs.each { |job|
-            job.templates.each{ |template|
-              release_model = release_manager.find_by_name(template.release.name)
-              template.package_models.each{ |package|
-
-                release_version_model = release_manager.find_version(release_model, template.release.version)
-                packages_list = release_version_model.transitive_dependencies(package)
-                packages_list << package
-
-                packages_list.each { |needed_package|
-                  if needed_package.sha1.nil? || needed_package.blobstore_id.nil?
-                    compiled_packages_list = Bosh::Director::Models::CompiledPackage[:package_id => needed_package.id, :stemcell_id => job.resource_pool.stemcell.model.id]
-                    if compiled_packages_list.nil?
-                      msg = "Can't deploy `#{release_version_model.release.name}/#{release_version_model.version}': it is not " +
-                          "compiled for `#{job.resource_pool.stemcell.model.desc}' and no source package is available"
-                      raise PackageMissingSourceCode, msg
-                    end
-                  end
-                }
-              }
-            }
-          }
-        end
-
         def track_and_log(message)
           @event_log.track(message) do
             @logger.info(message)

data/lib/bosh/director/instance_updater.rb

@@ -143,7 +143,8 @@ module Bosh::Director
     end
 
     def stop
-      stopper = Stopper.new(@instance, agent, @target_state, Config, @logger)
+      skip_drain = @deployment_plan.skip_drain_for_job?(@job.name)
+      stopper = Stopper.new(@instance, agent, @target_state, skip_drain, Config, @logger)
       stopper.stop
     end
 

data/lib/bosh/director/instance_updater/stopper.rb

@@ -1,14 +1,27 @@
 module Bosh::Director
   class InstanceUpdater::Stopper
-    def initialize(instance, agent_client, target_state, config, logger)
+    def initialize(instance, agent_client, target_state, skip_drain, config, logger)
       @instance = instance
       @agent_client = agent_client
       @target_state = target_state
+      @skip_drain = skip_drain
       @config = config
       @logger = logger
     end
 
     def stop
+      if @skip_drain
+        @logger.info("Skipping drain for '#{@instance}'")
+      else
+        perform_drain
+      end
+
+      @agent_client.stop
+    end
+
+    private
+
+    def perform_drain
       drain_type = shutting_down? ? 'shutdown' : 'update'
 
       # Apply spec might change after shutdown drain (unlike update drain)
@@ -21,12 +34,8 @@ module Bosh::Director
       else
         wait_for_dynamic_drain(drain_time)
       end
-
-      @agent_client.stop
     end
 
-    private
-
     def shutting_down?
       @instance.resource_pool_changed? ||
         @instance.persistent_disk_changed? ||

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

@@ -50,6 +50,7 @@ module Bosh::Director
             with_stemcell_lock(@stemcell.name, @stemcell.version, :timeout => lock_timeout) do
 
               planner = create_planner
+              DeploymentPlan::PlannerFactory.validate_packages(planner, {:context => 'export'})
               package_compile_step = DeploymentPlan::Steps::PackageCompileStep.new(
                   planner,
                   Config.cloud, # CPI

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

@@ -59,10 +59,6 @@ module Bosh::Director
           process_release(release_dir)
         }
 
-        if @rebase && @packages_unchanged && @jobs_unchanged
-          raise DirectorError, "Rebase is attempted without any job or package changes"
-        end
-
         "Created release `#{@name}/#{@version}'"
 
       rescue Exception => e

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3033.0'
+    VERSION = '1.3039.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3033.0
+  version: 1.3039.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3033.0
+        version: 1.3039.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  2c1c13
+  e8cf4e
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -723,6 +723,7 @@ files:
 - lib/bosh/director/deployment_plan/network.rb
 - lib/bosh/director/deployment_plan/network_subnet.rb
 - lib/bosh/director/deployment_plan/notifier.rb
+- lib/bosh/director/deployment_plan/options/skip_drain.rb
 - lib/bosh/director/deployment_plan/planner.rb
 - lib/bosh/director/deployment_plan/planner_factory.rb
 - lib/bosh/director/deployment_plan/release_version.rb