bosh-director 1.3165.0 → 1.3167.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 437509ee29b6b2a295acd39582fbb8581ab89dbd
-  data.tar.gz: aa6897b42854ca6cb4eb6f549a24eecb44b2a605
+  metadata.gz: 41dc4755ce67d81901fae275b7f2415ed8a3c32f
+  data.tar.gz: 7b30981be831221a4e03f67e348858d1927ab804
 SHA512:
-  metadata.gz: f0e5cf4691d434e4090ba3317d04fb8047bb031bbb6d9a882ce0f2048b23fe0b64cb578e9154cecd7b967a9b1f74fc261de7eb83409eb35db7c4ee3e971af446
-  data.tar.gz: 9d76083b5ecdc2f7359f2a424a637cbc1e84a4c2c7ba8a420d1ca2f7fe6cf97991229cffdbd790072d9aeea5fbc28de5fba898f097d5355357e50c4c002eee86
+  metadata.gz: 689d1da648a11d284bf9b38dfd87c9d58d4f5071d87668c9ab0157d267f924803b353786fd1335716a0905f103e6f329a6960ea9572915d65c648606df5dd95a
+  data.tar.gz: 19ee2fc7f6ebad795f8e5f61821e5266c4bbf2281653975de3598c3fab3a59b854f1ad7413794596431e8f01a714dc67b9d8096722e6a8038475f1a2673d6b4e

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

@@ -18,28 +18,14 @@ module Bosh::Director
         json_encode(response)
       end
 
-      # PUT /deployments/foo/jobs/dea?new_name=dea_new
       put '/:deployment/jobs/:job', :consumes => :yaml do
-        if params['state']
-          options = {
-            'job_states' => {
-              params[:job] => {
-                'state' => params['state']
-              }
-            }
-          }
-        else
-          unless params['new_name']
-            raise DirectorError, "Missing operation on job `#{params[:job]}'"
-          end
-          options = {
-            'job_rename' => {
-              'old_name' => params[:job],
-              'new_name' => params['new_name']
+        options = {
+          'job_states' => {
+            params[:job] => {
+              'state' => params['state']
             }
           }
-          options['job_rename']['force'] = true if params['force'] == 'true'
-        end
+        }
 
         deployment = @deployment_manager.find_by_name(params[:deployment])
         manifest = ((request.content_length.nil?  || request.content_length.to_i == 0) && (params['state'])) ? StringIO.new(deployment.manifest) : request.body

data/lib/bosh/director/cloudcheck_helper.rb

@@ -97,7 +97,7 @@ module Bosh::Director
       dns_manager.flush_dns_cache
 
       cleaner = RenderedJobTemplatesCleaner.new(instance_model, App.instance.blobstores.blobstore, @logger)
-      InstanceUpdater::StateApplier.new(instance_plan_to_create, agent_client(instance_model.vm), cleaner).apply
+      InstanceUpdater::StateApplier.new(instance_plan_to_create, agent_client(instance_model.vm), cleaner, @logger).apply
     end
 
     private

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

@@ -18,7 +18,6 @@ module Bosh::Director
       bind_releases
 
       migrate_legacy_dns_records
-      bind_job_renames
 
       instance_repo = Bosh::Director::DeploymentPlan::InstanceRepository.new(@logger)
       states_by_existing_instance = current_states_by_instance(@deployment_plan.candidate_existing_instances)
@@ -167,28 +166,10 @@ module Bosh::Director
       @dns_manager.configure_nameserver
     end
 
-    def bind_job_renames
-      @deployment_plan.instance_models.each do |instance_model|
-        update_instance_if_rename(instance_model)
-      end
-    end
-
     def migrate_legacy_dns_records
       @deployment_plan.instance_models.each do |instance_model|
         @dns_manager.migrate_legacy_records(instance_model)
       end
     end
-
-    def update_instance_if_rename(instance_model)
-      if @deployment_plan.rename_in_progress?
-        old_name = @deployment_plan.job_rename['old_name']
-        new_name = @deployment_plan.job_rename['new_name']
-
-        if instance_model.job == old_name
-          @logger.info("Renaming `#{old_name}' to `#{new_name}'")
-          instance_model.update(:job => new_name)
-        end
-      end
-    end
   end
 end

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

@@ -38,10 +38,6 @@ module Bosh::Director
         end
       end
 
-      def parse_name
-        safe_property(@deployment_manifest, 'name', :class => String)
-      end
-
       def parse_properties
         @deployment.properties = safe_property(@deployment_manifest, 'properties',
           :class => Hash, :default => {})

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

@@ -46,8 +46,6 @@ module Bosh::Director
       # VMs from the old manifest that are not in the new manifest
       attr_accessor :unneeded_vms
 
-      attr_reader :job_rename
-
       # @return [Boolean] Indicates whether VMs should be recreated
       attr_reader :recreate
 
@@ -75,9 +73,6 @@ module Bosh::Director
         @unneeded_vms = []
         @unneeded_instances = []
 
-        @job_rename = safe_property(options, 'job_rename',
-          :class => Hash, :default => {})
-
         @recreate = !!options['recreate']
 
         @link_spec = Hash.new{ |h,k| h[k] = Hash.new(&h.default_proc) }
@@ -221,12 +216,6 @@ module Bosh::Director
       # Adds a job by name
       # @param [Bosh::Director::DeploymentPlan::Job] job
       def add_job(job)
-        if rename_in_progress? && @job_rename['old_name'] == job.name
-          raise DeploymentRenamedJobNameStillUsed,
-            "Renamed job `#{job.name}' is still referenced in " +
-              'deployment manifest'
-        end
-
         if @jobs_canonical_name_index.include?(job.canonical_name)
           raise DeploymentCanonicalJobNameTaken,
             "Invalid job name `#{job.name}', canonical name already taken"
@@ -248,10 +237,6 @@ module Bosh::Director
         @jobs.select(&:starts_on_deploy?)
       end
 
-      def rename_in_progress?
-        @job_rename['old_name'] && @job_rename['new_name']
-      end
-
       def persist_updates!
         #prior updates may have had release versions that we no longer use.
         #remove the references to these stale releases.

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

@@ -63,7 +63,6 @@ module Bosh
             'recreate' => !!options['recreate'],
             'skip_drain' => options['skip_drain'],
             'job_states' => options['job_states'] || {},
-            'job_rename' => options['job_rename'] || {}
           }
 
           @logger.info('Creating deployment plan')

data/lib/bosh/director/errors.rb

@@ -207,7 +207,6 @@ module Bosh::Director
   DeploymentDuplicateReleaseName = err(190002)
   DeploymentDuplicateResourcePoolName = err(190003)
   DeploymentDuplicateVmTypeName = err(190004)
-  DeploymentRenamedJobNameStillUsed = err(190005)
   DeploymentCanonicalJobNameTaken = err(190006)
   DeploymentCanonicalNetworkNameTaken = err(190007)
   DeploymentNoNetworks = err(190008)

data/lib/bosh/director/instance_updater.rb

@@ -2,11 +2,8 @@ require 'bosh/director/rendered_job_templates_cleaner'
 
 module Bosh::Director
   class InstanceUpdater
-    WATCH_INTERVALS = 10
     MAX_RECREATE_ATTEMPTS = 3
 
-    attr_reader :current_state
-
     def self.new_instance_updater(ip_provider)
       logger = Config.logger
       cloud = Config.cloud
@@ -38,8 +35,8 @@ module Bosh::Director
       @dns_manager = dns_manager
       @disk_manager = disk_manager
       @ip_provider = ip_provider
-      @current_state = {}
       @vm_recreator = vm_recreator
+      @current_state = {}
     end
 
     def update(instance_plan, options = {})
@@ -94,19 +91,13 @@ module Bosh::Director
       end
 
       cleaner = RenderedJobTemplatesCleaner.new(instance.model, @blobstore, @logger)
-      InstanceUpdater::StateApplier.new(instance_plan, agent(instance), cleaner).apply
+      state_applier = InstanceUpdater::StateApplier.new(instance_plan, agent(instance), cleaner, @logger)
+      state_applier.apply
 
-      instance.update_state
-
-      wait_until_running(instance_plan)
-
-      if instance.state == "started" && current_state["job_state"] != "running"
-        raise AgentJobNotRunning, "`#{instance}' is not running after update"
-      end
-
-      if instance.state == "stopped" && current_state["job_state"] == "running"
-        raise AgentJobNotStopped, "`#{instance}' is still running despite the stop command"
-      end
+      job = instance_plan.desired_instance.job
+      min_watch_time = get_min_watch_time(job.update)
+      max_watch_time = get_max_watch_time(job.update)
+      state_applier.post_start(min_watch_time, max_watch_time)
     end
 
     private
@@ -140,24 +131,6 @@ module Bosh::Director
       @dns_manager.flush_dns_cache
     end
 
-    # Returns an array of wait times distributed
-    # on the [min_watch_time..max_watch_time] interval.
-    #
-    # Tries to respect intervals but doesn't allow an interval to
-    # fall under 1 second.
-    # All times are in milliseconds.
-    # @param [Numeric] min_watch_time minimum time to watch the jobs
-    # @param [Numeric] max_watch_time maximum time to watch the jobs
-    # @param [Numeric] intervals number of intervals between polling
-    #   the state of the jobs
-    # @return [Array<Numeric>] watch schedule
-    def watch_schedule(min_watch_time, max_watch_time, intervals = WATCH_INTERVALS)
-      delta = (max_watch_time - min_watch_time).to_f
-      step = [1000, delta / (intervals - 1)].max
-
-      [min_watch_time] + ([step] * (delta / step).floor)
-    end
-
     def get_min_watch_time(update_config)
       canary? ? update_config.min_canary_watch_time : update_config.min_update_watch_time
     end
@@ -174,30 +147,6 @@ module Bosh::Director
       instance_plan.changes.include?(:dns) && instance_plan.changes.size == 1
     end
 
-    # Watch times don't include the get_state roundtrip time, so effective
-    # max watch time is roughly:
-    # max_watch_time + N_WATCH_INTERVALS * avg_roundtrip_time
-    def wait_until_running(instance_plan)
-      instance = instance_plan.instance
-      job = instance_plan.desired_instance.job
-      min_watch_time = get_min_watch_time(job.update)
-      max_watch_time = get_max_watch_time(job.update)
-      watch_schedule(min_watch_time, max_watch_time).each do |watch_time|
-        sleep_time = watch_time.to_f / 1000
-        @logger.info("Waiting for #{sleep_time} seconds to check #{instance} status")
-        sleep(sleep_time)
-        @logger.info("Checking if #{instance} has been updated after #{sleep_time} seconds")
-
-        @current_state = agent(instance).get_state
-
-        if instance.state == "started"
-          break if current_state["job_state"] == "running"
-        elsif instance.state == "stopped"
-          break if current_state["job_state"] != "running"
-        end
-      end
-    end
-
     def needs_recreate?(instance_plan)
       instance = instance_plan.instance
 

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

@@ -1,10 +1,11 @@
 module Bosh::Director
   class InstanceUpdater::StateApplier
-    def initialize(instance_plan, agent_client, rendered_job_templates_cleaner)
+    def initialize(instance_plan, agent_client, rendered_job_templates_cleaner, logger)
       @instance_plan = instance_plan
       @instance = @instance_plan.instance
       @agent_client = agent_client
       @rendered_job_templates_cleaner = rendered_job_templates_cleaner
+      @logger = logger
     end
 
     def apply
@@ -17,5 +18,62 @@ module Bosh::Director
         @agent_client.start
       end
     end
+
+    def post_start(min_watch_time, max_watch_time)
+      current_state = wait_until_desired_state(min_watch_time, max_watch_time)
+
+      if @instance.state == 'started'
+        if current_state['job_state'] != 'running'
+          raise AgentJobNotRunning, "`#{@instance}' is not running after update"
+        else
+          @agent_client.run_script('post-start', {})
+        end
+      end
+
+      if @instance.state == 'stopped' && current_state['job_state'] == 'running'
+        raise AgentJobNotStopped, "`#{@instance}' is still running despite the stop command"
+      end
+
+      @instance.update_state
+    end
+
+    private
+
+    def wait_until_desired_state(min_watch_time, max_watch_time)
+      current_state = {}
+      watch_schedule(min_watch_time, max_watch_time).each do |watch_time|
+        sleep_time = watch_time.to_f / 1000
+        @logger.info("Waiting for #{sleep_time} seconds to check #{@instance} status")
+        sleep(sleep_time)
+        @logger.info("Checking if #{@instance} has been updated after #{sleep_time} seconds")
+
+        current_state = @agent_client.get_state
+
+        if @instance.state == 'started'
+          break if current_state['job_state'] == 'running'
+        elsif @instance.state == 'stopped'
+          break if current_state['job_state'] != 'running'
+        end
+      end
+
+      current_state
+    end
+
+    # Returns an array of wait times distributed
+    # on the [min_watch_time..max_watch_time] interval.
+    #
+    # Tries to respect intervals but doesn't allow an interval to
+    # fall under 1 second.
+    # All times are in milliseconds.
+    # @param [Numeric] min_watch_time minimum time to watch the jobs
+    # @param [Numeric] max_watch_time maximum time to watch the jobs
+    # @return [Array<Numeric>] watch schedule
+    def watch_schedule(min_watch_time, max_watch_time)
+      delta = (max_watch_time - min_watch_time).to_f
+      watch_intervals = 10
+      step = [1000, delta / (watch_intervals - 1)].max
+
+      [min_watch_time] + ([step] * (delta / step).floor)
+    end
   end
 end

data/lib/bosh/director/problem_handlers/missing_disk.rb

@@ -68,7 +68,7 @@ module Bosh::Director
           begin
             @logger.debug('Sending cpi request: detach_disk')
             cloud.detach_disk(@vm.cid, @disk.disk_cid) if @vm.cid
-          rescue Bosh::Clouds::DiskNotAttached
+          rescue Bosh::Clouds::DiskNotAttached, Bosh::Clouds::DiskNotFound
           end
         end
 

data/lib/bosh/director/problem_handlers/missing_vm.rb

@@ -18,7 +18,7 @@ module Bosh::Director
       end
 
       resolution :recreate_vm do
-        plan { "Recreate VM" }
+        plan { "Recreate VM for '#{@vm.instance.job}/#{@vm.instance.index}'" }
         action { recreate_vm(@vm) }
       end
 

data/lib/bosh/director/problem_handlers/unresponsive_agent.rb

@@ -33,7 +33,7 @@ module Bosh::Director
       end
 
       resolution :recreate_vm do
-        plan { 'Recreate VM' }
+        plan { "Recreate VM for '#{@vm.instance.job}/#{@vm.instance.index}'" }
         action { validate; ensure_cid; recreate_vm(@vm) }
       end
 

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3165.0'
+    VERSION = '1.3167.0'
   end
 end

metadata

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