bosh-director 1.3122.0 → 1.3123.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ec6dc203b602d57e98a511fff53b46b3400b02c
-  data.tar.gz: e182a9575ff473028360ba30622614a0a85bdcbf
+  metadata.gz: 2a7c3216d881eaf691df4e7719c312a0b05e33bb
+  data.tar.gz: 2833073f1a613e9aa25ba4d87e41da1444393c31
 SHA512:
-  metadata.gz: 5f20efc6d54acc5f57519c5106b00f6f5de0ecdf096a1b23104d644452f002b6b5be0ea80b6947bf8e6df505f75b312acfa0ffa067cecd665f9c5a7678359070
-  data.tar.gz: 87b3ad7cc3812d3d8336c6e7c470513cc137af3131fd9e15bc509cb93ec93678b2e57b7024dfd15fc6b7caf10ece93362b6be754fb5c0c89dc69ec3d1f59a01b
+  metadata.gz: 23ff0c0f04f350def0e713a689a3e6d0662b4f9ab742ad8e031c8b8ce2417c4baa48d2eb0dfc485d4f613f65b47917e723410f39b894b6d20b335acec7784792
+  data.tar.gz: 1b0a899924443fac2c3584d401c1d0d9c67cf60f5219ed5e6a974c211cc206d631fed2a5d8eb52377a844da9512aa3ec86e767be38e4b269c1195fe4fce1748f

data/lib/bosh/director/agent_client.rb

@@ -168,7 +168,11 @@ module Bosh::Director
       @deadline = Time.now.to_i + deadline
 
       begin
+        Config.job_cancelled?
         ping
+      rescue TaskCancelled => e
+        @logger.debug("Task was cancelled. Stop waiting response from vm")
+        raise e
       rescue RpcTimeout
         retry if @deadline - Time.now.to_i > 0
         raise RpcTimeout, "Timed out pinging to #{@client_id} after #{deadline} seconds"

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

@@ -7,7 +7,8 @@ module Bosh::Director
         payload = json_decode(request.body)
         options = {
           rebase: params['rebase'] == 'true',
-          sha1: params['sha1']
+          fix:    params['fix'] == 'true',
+          sha1:   params['sha1']
         }
         task = @release_manager.create_release_from_url(current_user, payload['location'], options)
         redirect "/tasks/#{task.id}"
@@ -15,7 +16,8 @@ module Bosh::Director
 
       post '/', :consumes => :multipart do
         options = {
-          rebase: params['rebase'] == 'true',
+          rebase:         params['rebase'] == 'true',
+          fix:            params['fix'] == 'true',
         }
 
         task = @release_manager.create_release_from_file_path(current_user, params[:nginx_upload_path], options)

data/lib/bosh/director/blob_util.rb

@@ -22,6 +22,11 @@ module Bosh::Director
       blobstore_id
     end
 
+    def self.replace_blob(old_blobstore_id, path)
+      blobstore.delete(old_blobstore_id) if blobstore.exists?(old_blobstore_id)
+      return create_blob path
+    end
+
     def self.save_to_global_cache(compiled_package, cache_key)
       global_cache_filename = [compiled_package.package.name, cache_key].join('-')
       Dir.mktmpdir do |path|

data/lib/bosh/director/cloudcheck_helper.rb

@@ -51,6 +51,8 @@ module Bosh::Director
         agent_client(vm).wait_until_ready
       rescue Bosh::Director::RpcTimeout
         handler_error("Agent still unresponsive after reboot")
+      rescue Bosh::Director::TaskCancelled
+        handler_error("Task was cancelled")
       end
     end
 

data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb

@@ -166,8 +166,8 @@ module Bosh::Director
             configure_vm(vm, agent, network_settings)
             vm_data.agent = agent
             yield vm_data
-          rescue RpcTimeout => e
-            # if we time out waiting for the agent, we should clean up the the VM
+          rescue RpcTimeout, TaskCancelled => e
+            # if we time out waiting for the agent or task was cancelled, we should clean up the the VM
             # as it will leave us in an unrecoverable state otherwise
             @vm_reuser.remove_vm(vm_data)
             tear_down_vm(vm_data)

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

@@ -14,75 +14,24 @@ module Bosh::Director
       def initialize(dest, options={})
         @backup_file = dest
         @tar_gzipper = options.fetch(:tar_gzipper) { Core::TarGzipper.new }
-        @blobstore_client = options.fetch(:blobstore) { App.instance.blobstores.blobstore }
         @db_adapter = options.fetch(:db_adapter) { Bosh::Director::DbBackup.create(Config.db_config) }
-        @base_dir = options.fetch(:base_dir) { Config.base_dir }
-        @log_dir = options.fetch(:log_dir) { Config.log_dir }
       end
 
       def perform
         Dir.mktmpdir do |tmp_output_dir|
           event_log.begin_stage('Backing up director', 4)
-
-          files = []
-
-          if @log_dir
-            backup_logs("#{tmp_output_dir}/logs.tgz")
-            files << 'logs.tgz'
-          end
-
-          backup_task_logs("#{tmp_output_dir}/task_logs.tgz")
-          files << 'task_logs.tgz'
-
           backup_database("#{tmp_output_dir}/director_db.sql")
-          files << 'director_db.sql'
-
-          backup_blobstore("#{tmp_output_dir}/blobs.tgz")
-          files << 'blobs.tgz'
-
-          @tar_gzipper.compress(tmp_output_dir, files, @backup_file)
-
+          @tar_gzipper.compress(tmp_output_dir, 'director_db.sql', @backup_file)
           "Backup created at #{@backup_file}"
         end
       end
 
       private
-      def backup_logs(output)
-        track_and_log('Backing up logs') do
-          @tar_gzipper.compress(File.dirname(@log_dir), [File.basename(@log_dir)], output, copy_first: true)
-        end
-      end
-
-      def backup_task_logs(output)
-        track_and_log('Backing up task logs') do
-          @tar_gzipper.compress(@base_dir, %w(tasks), output, copy_first: true)
-        end
-      end
-
       def backup_database(output)
         track_and_log('Backing up database') do
           @db_adapter.export(output)
         end
       end
-
-      def backup_blobstore(output)
-        Dir.mktmpdir do |tmp_dir|
-          Dir.mkdir(File.join(tmp_dir, 'blobs'))
-
-          track_and_log('Backing up blobstore') do
-            [Models::Package.all, Models::CompiledPackage.all, Models::Template.all].each do |packages|
-              packages.each do |package|
-                File.open(File.join(tmp_dir, 'blobs', package.blobstore_id), 'w') do |file|
-                  logger.debug("Writing file #{file.path}")
-                  @blobstore_client.get(package.blobstore_id, file)
-                end
-              end
-            end
-
-            @tar_gzipper.compress(tmp_dir, 'blobs', output)
-          end
-        end
-      end
     end
   end
 end

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

@@ -28,7 +28,7 @@ module Bosh::Director
       def task_cancelled?
         return false if task_id.nil?
         task = task_manager.find_task(task_id)
-        task && (task.state == 'cancelling' || task.state == 'timeout')
+        task && (task.state == 'cancelling' || task.state == 'timeout' || task.state == 'cancelled')
       end
 
       def task_checkpoint

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

@@ -33,6 +33,7 @@ module Bosh::Director
         @release_model, @release_version_model, @manifest, @name, @version = nil, nil, nil, nil, nil
 
         @rebase = !!options['rebase']
+        @fix = !!options['fix']
       end
 
       # Extracts release tarball, verifies release manifest and saves release in DB
@@ -328,7 +329,7 @@ module Bosh::Director
               end
             end
 
-            if source_release && package.blobstore_id.nil?
+            if source_release && (package.blobstore_id.nil? || @fix)
               save_package_source_blob(package, package_meta, release_dir)
               package.save
             end
@@ -484,25 +485,42 @@ module Bosh::Director
 
       # @return [boolean] true if a new blob was created; false otherwise
       def save_package_source_blob(package, package_meta, release_dir)
-        return false unless package.blobstore_id.nil?
-
-        name, version, existing_blob = package_meta['name'], package_meta['version'], package_meta['blobstore_id']
+        name, version, existing_blob, sha1 = package_meta['name'], package_meta['version'], package_meta['blobstore_id'], package_meta['sha1']
         desc = "package '#{name}/#{version}'"
+        package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
+
+        if @fix
+          if package.blobstore_id != nil
+            logger.info("Verifying package #{desc} with blobstore_id: #{package.blobstore_id}")
+            validate_tgz(package_tgz, desc)
+            fix_package(package, package_tgz)
+            return true
+          end
+          package.sha1 = package_meta['sha1']
+
+          if existing_blob
+            pkg = Models::Package.where(blobstore_id: existing_blob).first
+            logger.info("Verifying package #{desc} with blobstore_id: #{existing_blob}")
+            fix_package(pkg, package_tgz)
+            package.blobstore_id = BlobUtil.copy_blob(pkg.blobstore_id)
+            return true
+          end
 
-        package.sha1 = package_meta['sha1']
-
-        if existing_blob
-          logger.info("Creating #{desc} from existing blob #{existing_blob}")
-          package.blobstore_id = BlobUtil.copy_blob(existing_blob)
-
-        elsif package
-          logger.info("Creating #{desc} from provided bits")
+        else
+          return false unless package.blobstore_id.nil?
+          package.sha1 = package_meta['sha1']
 
-          package_tgz = File.join(release_dir, 'packages', "#{name}.tgz")
-          validate_tgz(package_tgz, desc)
-          package.blobstore_id = BlobUtil.create_blob(package_tgz)
+          if existing_blob
+            logger.info("Creating #{desc} from existing blob #{existing_blob}")
+            package.blobstore_id = BlobUtil.copy_blob(existing_blob)
+            return true
+          end
         end
 
+        logger.info("Creating #{desc} from provided bits")
+        validate_tgz(package_tgz, desc)
+        package.blobstore_id = BlobUtil.create_blob(package_tgz)
+
         true
       end
 
@@ -618,6 +636,13 @@ module Bosh::Director
         list = Bosh::Common::Version::ReleaseVersionList.parse(strings)
         list.rebase(@version)
       end
+
+      def fix_package(package, package_tgz)
+        single_step_stage("Fixing package '#{package.name}/#{package.version}'") do
+          logger.info("Fixing package '#{package.name}/#{package.version}'")
+          package.blobstore_id = BlobUtil.replace_blob(package.blobstore_id, package_tgz)
+        end
+      end
     end
   end
 end

data/lib/bosh/director/resource_pool_updater.rb

@@ -50,7 +50,6 @@ module Bosh::Director
 
       vm_model = VmCreator.new.create(deployment, stemcell, @resource_pool.cloud_properties,
                                 vm.network_settings, nil, @resource_pool.env)
-
       agent = AgentClient.with_defaults(vm_model.agent_id)
       agent.wait_until_ready
       agent.update_settings(Config.trusted_certs)

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3122.0'
+    VERSION = '1.3123.0'
   end
 end

metadata

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