bosh-director 1.3091.0 → 1.3093.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 656e5ca79b59bbb04a3b399903fa5951f3f0f47b
-  data.tar.gz: 26eb186045205d0561fa2977af143eba0d72b567
+  metadata.gz: 6a30fcb8bfc2daaf94df571fbb0a6cacfa93e805
+  data.tar.gz: 089c887cf65bbbbf7eecf56bc7641fd081638ade
 SHA512:
-  metadata.gz: 8ef3471c30e39cfa636ea6aef915352629b51badc4c76d81c979b7f322a508fe54ebb7b43ccdac71f6c65516fe163a9c1c4735d0ad992e6d4436ac3a279dd4f8
-  data.tar.gz: c147d3c4255525be03bacbb9c827eed51540fa98c5b2f997d435d54837140abee68dbdfc65b6fa43982a5e41f38c978fe1dd1aee77832cc30e99ea9bd223ea28
+  metadata.gz: c0e320d18490f4a6fe4454861f2ec2b3d34cc740e01bb2a2fcf7ead1efb6ea4c7ed19b0ce82868c6a6d613eb3f7757c7e4704392e62277615960f3286e94ce44
+  data.tar.gz: 4112eb64c4527535836bac70405bbfe1b11c19df73a4fb3ee0cf7176003ff6218d4a23507d6c1548ba37699269c1d465052abbbd78035f18e1e6ab5480e77395

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

@@ -5,12 +5,18 @@ module Bosh::Director
     class StemcellsController < BaseController
       post '/', :consumes => :json do
         payload = json_decode(request.body)
-        task = @stemcell_manager.create_stemcell_from_url(current_user, payload['location'])
+        options = {
+            fix: params['fix'] == 'true',
+        }
+        task = @stemcell_manager.create_stemcell_from_url(current_user, payload['location'], options)
         redirect "/tasks/#{task.id}"
       end
 
       post '/', :consumes => :multipart do
-        task = @stemcell_manager.create_stemcell_from_file_path(current_user, params[:nginx_upload_path])
+        options = {
+            fix: params['fix'] == 'true',
+        }
+        task = @stemcell_manager.create_stemcell_from_file_path(current_user, params[:nginx_upload_path], options)
         redirect "/tasks/#{task.id}"
       end
 

data/lib/bosh/director/api/stemcell_manager.rb

@@ -31,16 +31,17 @@ module Bosh::Director
         false
       end
 
-      def create_stemcell_from_url(username, stemcell_url)
-        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_url, { remote: true }])
+      def create_stemcell_from_url(username, stemcell_url, options)
+        options[:remote] = true
+        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_url, options])
       end
 
-      def create_stemcell_from_file_path(username, stemcell_path)
+      def create_stemcell_from_file_path(username, stemcell_path, options)
         unless File.exists?(stemcell_path)
           raise DirectorError, "Failed to create stemcell: file not found - #{stemcell_path}"
         end
 
-        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_path])
+        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_path, options])
       end
 
       def delete_stemcell(username, stemcell, options={})

data/lib/bosh/director/instance_deleter.rb

@@ -37,7 +37,7 @@ module Bosh::Director
         delete_persistent_disks(instance.persistent_disks)
         delete_dns(instance.job, instance.index)
 
-        RenderedJobTemplatesCleaner.new(instance, @blobstore).clean_all
+        RenderedJobTemplatesCleaner.new(instance, @blobstore, @logger).clean_all
 
         vm.db.transaction do
           instance.destroy

data/lib/bosh/director/instance_updater.rb

@@ -65,7 +65,7 @@ module Bosh::Director
         steps << proc {
           VmMetadataUpdater.build.update(@vm, {})
           apply_state(@instance.spec)
-          RenderedJobTemplatesCleaner.new(@instance.model, @blobstore).clean
+          RenderedJobTemplatesCleaner.new(@instance.model, @blobstore, @logger).clean
         }
       end
 

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

@@ -144,7 +144,7 @@ module Bosh::Director
           end
 
           ignoring_errors_when_forced do
-            RenderedJobTemplatesCleaner.new(instance, @blobstore).clean_all
+            RenderedJobTemplatesCleaner.new(instance, @blobstore, @logger).clean_all
           end
 
           instance.destroy

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

@@ -7,7 +7,7 @@ module Bosh::Director
       include DownloadHelper
 
       UPDATE_STEPS = 5
-      
+
       @queue = :normal
 
       def self.job_type
@@ -28,6 +28,7 @@ module Bosh::Director
 
         @cloud = Config.cloud
         @stemcell_manager = Api::StemcellManager.new
+        @fix = options['fix']
       end
 
       def perform
@@ -69,19 +70,20 @@ module Bosh::Director
           end
         end
 
+        stemcell = nil
         track_and_log("Checking if this stemcell already exists") do
-          if @stemcell_manager.stemcell_exists?(@name, @version)
-            raise StemcellAlreadyExists,
-                  "Stemcell `#{@name}/#{@version}' already exists"
+          begin
+            stemcell = @stemcell_manager.find_by_name_and_version @name, @version
+            raise StemcellAlreadyExists, "Stemcell `#{@name}/#{@version}' already exists" unless @fix
+          rescue StemcellNotFound => e
+            stemcell = Models::Stemcell.new
+            stemcell.name = @name
+            stemcell.operating_system = @operating_system
+            stemcell.version = @version
+            stemcell.sha1 = @sha1
           end
         end
 
-        stemcell = Models::Stemcell.new
-        stemcell.name = @name
-        stemcell.operating_system = @operating_system
-        stemcell.version = @version
-        stemcell.sha1 = @sha1
-
         track_and_log("Uploading stemcell #{@name}/#{@version} to the cloud") do
           stemcell.cid = @cloud.create_stemcell(@stemcell_image, @cloud_properties)
           logger.info("Cloud created stemcell: #{stemcell.cid}")
@@ -96,7 +98,7 @@ module Bosh::Director
         FileUtils.rm_rf(stemcell_dir) if stemcell_dir
         FileUtils.rm_rf(@stemcell_path) if @stemcell_path
       end
-      
+
       private
 
       def download_remote_stemcell

data/lib/bosh/director/rendered_job_templates_cleaner.rb

@@ -1,20 +1,31 @@
 module Bosh::Director
   class RenderedJobTemplatesCleaner
-    def initialize(instance_model, blobstore)
+    def initialize(instance_model, blobstore, logger)
       @instance_model = instance_model
       @blobstore = blobstore
+      @logger = logger
     end
 
     def clean
       @instance_model.stale_rendered_templates_archives.each do |archive|
-        @blobstore.delete(archive.blobstore_id)
+        begin
+          @blobstore.delete(archive.blobstore_id)
+        rescue Bosh::Blobstore::NotFound => e
+          @logger.debug("Blobstore#delete error: #{e.message}, will ignore this error and delete the db record")
+        end
+
         archive.delete
       end
     end
 
     def clean_all
       @instance_model.rendered_templates_archives.each do |archive|
-        @blobstore.delete(archive.blobstore_id)
+        begin
+          @blobstore.delete(archive.blobstore_id)
+        rescue Bosh::Blobstore::NotFound => e
+          @logger.debug("Blobstore#delete error: #{e.message}, will ignore this error and delete the db record")
+        end
+
         archive.delete
       end
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3091.0'
+    VERSION = '1.3093.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3091.0
+  version: 1.3093.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,140 +16,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3091.0
+        version: 1.3093.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement