bosh-director 1.3026.0 → 1.3029.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed519d29a4572509fe05ebf8fec37d67c1c277d6
-  data.tar.gz: 7e4fdc1b9b3e3b8e8f5e3387196dc2b8d9eeed9f
+  metadata.gz: 4e52d8d9d27d0a46765b40291d556b32a36943d3
+  data.tar.gz: 45ba14bb4b7d987a3511c0ae08c4e79c11fa7e37
 SHA512:
-  metadata.gz: 8e6d564f23a21437dd2303e357b2600bcebdeb39dbce684e7df225169ed7640615db70c0c6a9ff280d38eed29c76aca3c5b61aa3c426d5307e40abd9286d96e9
-  data.tar.gz: 9617aafab3a20069229d7963f8b43e99bb709c461e6834f3e6cbc21aa202932364e33c7d5a9a263813697fd8e125312812c84893ffc15849957df3e6c58e7789
+  metadata.gz: 4b7e47f11d79e579051e59c393e9a2699817c855603762b9986a5f327ef62693e6f20e96cedc8defb2bc98a33b9adc9056a3f89be4aa247a831326158782ce6c
+  data.tar.gz: 3b50663eca89edb836ffd924d17c18bc4cd8477d41d1a3e8384d4b40d36ab091fa7d3fd492ae783638c15d753ba20fbb751ff182dbee618c67456bf8d31fc268

data/lib/bosh/director/agent_client.rb

@@ -52,59 +52,68 @@ module Bosh::Director
     end
 
     def method_missing(method_name, *args)
-      send_message(method_name, *args)
-    end
-
-    # Define methods on this class to make instance_double more useful
-    [
-      :cancel_task,
-      :get_state,
-      :get_task,
-      :list_disk,
-      :prepare_network_change,
-      :prepare_configure_networks,
-      :start,
-    ].each do |message|
-      define_method(message) do |*args|
-        send_message(message, *args)
-      end
+      handle_message_with_retry(method_name, *args)
+    end
+
+    def get_state(*args)
+      send_message(:get_state, *args)
+    end
+
+    def cancel_task(*args)
+      send_message(:cancel_task, *args)
+    end
+
+    def list_disk(*args)
+      send_message(:list_disk, *args)
+    end
+
+    def prepare_configure_networks(*args)
+      send_message(:prepare_configure_networks, *args)
+    end
+
+    def prepare_network_change(*args)
+      send_message(:prepare_network_change, *args)
+    end
+
+    def start(*args)
+      send_message(:start, *args)
     end
 
     def prepare(*args)
-      send_long_running_message(:prepare, *args)
+      send_message(:prepare, *args)
     end
 
     def apply(*args)
-      send_long_running_message(:apply, *args)
+      send_message(:apply, *args)
     end
 
     def compile_package(*args)
-      send_long_running_message(:compile_package, *args)
+      send_message(:compile_package, *args)
     end
 
     def drain(*args)
-      send_long_running_message(:drain, *args)
+      send_message(:drain, *args)
     end
 
     def fetch_logs(*args)
-      send_long_running_message(:fetch_logs, *args)
+      send_message(:fetch_logs, *args)
     end
 
     def migrate_disk(*args)
-      send_long_running_message(:migrate_disk, *args)
+      send_message(:migrate_disk, *args)
     end
 
     def mount_disk(*args)
-      send_long_running_message(:mount_disk, *args)
+      send_message(:mount_disk, *args)
     end
 
     def unmount_disk(*args)
-      send_long_running_message(:unmount_disk, *args)
+      send_message(:unmount_disk, *args)
     end
 
     def update_settings(certs)
       begin
-        send_long_running_message(:update_settings, {"trusted_certs" => certs})
+        send_message(:update_settings, {"trusted_certs" => certs})
       rescue RpcRemoteException => e
         if e.message =~ /unknown message/
           @logger.warn("Ignoring update_settings 'unknown message' error from the agent: #{e.inspect}")
@@ -115,11 +124,11 @@ module Bosh::Director
     end
 
     def stop(*args)
-      send_long_running_message(:stop, *args)
+      send_message(:stop, *args)
     end
 
-    def start_errand(*args)
-      start_long_running_task(:run_errand, *args)
+    def run_errand(*args)
+      start_task(:run_errand, *args)
     end
 
     def wait_for_task(agent_task_id, &blk)
@@ -135,7 +144,7 @@ module Bosh::Director
     end
 
     def configure_networks(*args)
-      send_long_running_message(:configure_networks, *args)
+      send_message(:configure_networks, *args)
     end
 
     def wait_until_ready(deadline = 600)
@@ -196,8 +205,8 @@ module Bosh::Director
           unless timeout > 0
             @nats_rpc.cancel_request(request_id)
             raise RpcTimeout,
-                  "Timed out sending `#{method_name}' to #{@client_id} " +
-                    "after #{@timeout} seconds"
+              "Timed out sending `#{method_name}' to #{@client_id} " +
+                "after #{@timeout} seconds"
           end
           cond.wait(timeout)
         end
@@ -256,7 +265,7 @@ module Bosh::Director
       @resource_manager.delete_resource(blob_id)
     end
 
-    def send_message(message_name, *args)
+    def handle_message_with_retry(message_name, *args)
       retries = @retry_methods[message_name] || 0
       begin
         handle_method(message_name, args)
@@ -269,13 +278,17 @@ module Bosh::Director
       end
     end
 
-    def send_long_running_message(method_name, *args, &blk)
-      task = start_long_running_task(method_name, *args)
-      wait_for_task(task['agent_task_id'], &blk)
+    def send_message(method_name, *args, &blk)
+      task = start_task(method_name, *args)
+      if task['agent_task_id']
+        wait_for_task(task['agent_task_id'], &blk)
+      else
+        task['value']
+      end
     end
 
-    def start_long_running_task(method_name, *args)
-      AgentMessageConverter.convert_old_message_to_new(send_message(method_name, *args))
+    def start_task(method_name, *args)
+      AgentMessageConverter.convert_old_message_to_new(handle_message_with_retry(method_name, *args))
     end
 
     def get_task_status(agent_task_id)

data/lib/bosh/director/errand/runner.rb

@@ -26,8 +26,8 @@ module Bosh::Director
 
       begin
         event_log_stage.advance_and_track("#{@job.name}/#{instance.index}") do
-          start_errand_result = agent.start_errand
-          @agent_task_id = start_errand_result['agent_task_id']
+          run_errand_result = agent.run_errand
+          @agent_task_id = run_errand_result['agent_task_id']
           agent_task_result = agent.wait_for_task(agent_task_id, &blk)
         end
       rescue TaskCancelled => e

data/lib/bosh/director/errors.rb

@@ -73,6 +73,7 @@ module Bosh::Director
   ReleaseVersionInUse = err(30008)
   ReleaseDeleteFailed = err(30009)
   ReleaseVersionInvalid = err(30010)
+  ReleaseNotMatchingManifest = err(30011)
 
   ValidationInvalidType = err(40000)
   ValidationMissingField = err(40001)

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

@@ -132,12 +132,13 @@ module Bosh::Director
                       "(#{compiled_package.blobstore_id}) " +
                       "#{package.name}/#{package.version} " +
                       "for #{stemcell.name}/#{stemcell.version}")
-          delete_blobstore_id(compiled_package.blobstore_id) do
+
+          if delete_blobstore_id(compiled_package.blobstore_id)
             compiled_package.destroy
           end
         end
 
-        delete_blobstore_id(package.blobstore_id) do
+        if delete_blobstore_id(package.blobstore_id, true)
           package.remove_all_release_versions
           package.destroy
         end
@@ -146,7 +147,7 @@ module Bosh::Director
       def delete_template(template)
         logger.info("Deleting template: #{template.name}/#{template.version}")
 
-        delete_blobstore_id(template.blobstore_id) do
+        if delete_blobstore_id(template.blobstore_id)
           template.remove_all_release_versions
           template.destroy
         end
@@ -201,17 +202,21 @@ module Bosh::Director
         "/release/#{@name}"
       end
 
-      def delete_blobstore_id(blobstore_id)
+      def delete_blobstore_id(blobstore_id, nil_id_allowed = false)
+        if blobstore_id.nil? && nil_id_allowed
+          return true
+        end
+
         deleted = false
         begin
           @blobstore.delete(blobstore_id)
           deleted = true
         rescue Exception => e
-          logger.warn("Could not delete from blobstore: #{e}\n " +
-                      e.backtrace.join("\n"))
+          logger.warn("Could not delete from blobstore: #{e}\n " + e.backtrace.join("\n"))
           @errors << e
         end
-        yield if deleted || @force
+
+        return deleted || @force
       end
 
     end

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

@@ -25,7 +25,24 @@ module Bosh::Director
       # @return [void]
       def perform
         logger.info("Exporting release: #{@release_name}/#{@release_version} for #{@stemcell_os}/#{@stemcell_version}")
-        validate_and_prepare
+
+        stemcell_manager = Bosh::Director::Api::StemcellManager.new
+        @stemcell = stemcell_manager.find_by_os_and_version(@stemcell_os, @stemcell_version)
+
+        logger.info "Will compile with stemcell: #{@stemcell.desc}"
+
+        deployment_manager = Bosh::Director::Api::DeploymentManager.new
+        @targeted_deployment = deployment_manager.find_by_name(@deployment_name)
+        @deployment_manifest = Psych.load(@targeted_deployment.manifest)
+
+        release_manager = Bosh::Director::Api::ReleaseManager.new
+        release = release_manager.find_by_name(@release_name)
+        @release_version_model = release_manager.find_version(release, @release_version)
+
+        unless deployment_manifest_has_release?
+          raise ReleaseNotMatchingManifest, "Release #{@release_name}/#{@release_version} not found in deployment #{@deployment_name} manifest"
+        end
+
         lock_timeout = 15 * 60 # 15 minutes
 
         with_deployment_lock(@deployment_name, :timeout => lock_timeout) do
@@ -51,27 +68,21 @@ module Bosh::Director
         "Exported release: #{@release_name}/#{@release_version} for #{@stemcell_os}/#{@stemcell_version}"
       end
 
-      def validate_and_prepare
-        stemcell_manager = Bosh::Director::Api::StemcellManager.new
-        @stemcell = stemcell_manager.find_by_os_and_version(@stemcell_os, @stemcell_version)
-
-        logger.info "Will compile with stemcell: #{@stemcell.desc}"
-
-        deployment_manager = Bosh::Director::Api::DeploymentManager.new
-        @targeted_deployment = deployment_manager.find_by_name(@deployment_name)
-
-        release_manager = Bosh::Director::Api::ReleaseManager.new
-        release = release_manager.find_by_name(@release_name)
-        @release_version = release_manager.find_version(release, @release_version)
+      def deployment_manifest_has_release?
+        @deployment_manifest["releases"].each do |release|
+          if (release["name"] == @release_name) && (release["version"] == @release_version)
+            return true
+          end
+        end
+        false
       end
 
       def create_planner
-        modified_deployment_manifest = Psych.load(@targeted_deployment.manifest)
         cloud_config_model = @targeted_deployment.cloud_config
 
         planner_factory = DeploymentPlan::PlannerFactory.create(Config.event_log, Config.logger)
         planner = planner_factory.planner_without_vm_binding(
-            modified_deployment_manifest,
+            @deployment_manifest,
             cloud_config_model,
             {}
         )
@@ -97,8 +108,8 @@ module Bosh::Director
 
         blobstore_client = Bosh::Director::App.instance.blobstores.blobstore
 
-        compiled_packages_group = CompiledPackageGroup.new(@release_version, @stemcell)
-        templates = @release_version.templates.map
+        compiled_packages_group = CompiledPackageGroup.new(@release_version_model, @stemcell)
+        templates = @release_version_model.templates.map
 
         compiled_release_downloader = CompiledReleaseDownloader.new(compiled_packages_group, templates, blobstore_client)
         download_dir = compiled_release_downloader.download
@@ -128,14 +139,14 @@ module Bosh::Director
             "release" => @release_name,
             "instances" => 1,
             "resource_pool" => fake_resource_pool_manifest['name'],
-            "templates" => @release_version.templates.map do |template|
+            "templates" => @release_version_model.templates.map do |template|
               { "name" => template.name, "release" => @release_name }
             end,
             "networks" => [ "name" => network_name ],
         }
 
         fake_job = DeploymentPlan::Job.parse(planner, fake_job_spec_for_compiling, Config.event_log, Config.logger)
-        @release_version.packages.each { |package| fake_job.packages[package.name] = package }
+        @release_version_model.packages.each { |package| fake_job.packages[package.name] = package }
         fake_job.resource_pool.stemcell.bind_model
         fake_job.release.bind_model
         fake_job.templates.each { |template| template.bind_models }

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3026.0'
+    VERSION = '1.3029.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3026.0
+  version: 1.3029.0
 platform: ruby
 authors:
 - VMware
@@ -30,126 +30,126 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3026.0
+        version: 1.3029.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -572,7 +572,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  fb9e82
+  e6ccd1
 email: support@cloudfoundry.com
 executables:
 - bosh-director