bosh-director 1.2619.0 → 1.2624.0

data/lib/bosh/director/deployment_plan.rb

@@ -4,7 +4,7 @@ module Bosh::Director
 end
 
 require 'bosh/director/deployment_plan/compilation_config'
-require 'bosh/director/deployment_plan/idle_vm'
+require 'bosh/director/deployment_plan/vm'
 require 'bosh/director/deployment_plan/instance'
 require 'bosh/director/deployment_plan/job'
 require 'bosh/director/deployment_plan/network'

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

@@ -35,10 +35,10 @@ module Bosh::Director
     def bind_existing_deployment
       lock = Mutex.new
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-        @deployment_plan.vms.each do |vm|
+        @deployment_plan.vms.each do |vm_model|
           pool.process do
-            with_thread_name("bind_existing_deployment(#{vm.agent_id})") do
-              bind_existing_vm(vm, lock)
+            with_thread_name("bind_existing_deployment(#{vm_model.agent_id})") do
+              bind_existing_vm(vm_model, lock)
             end
           end
         end
@@ -46,15 +46,15 @@ module Bosh::Director
     end
 
     # Queries agent for VM state and updates deployment plan accordingly
-    # @param [Models::Vm] vm VM database model
+    # @param [Models::Vm] vm_model VM database model
     # @param [Mutex] lock Lock to hold on to while updating deployment plan
-    def bind_existing_vm(vm, lock)
-      state = get_state(vm)
+    def bind_existing_vm(vm_model, lock)
+      state = get_state(vm_model)
       lock.synchronize do
         @logger.debug('Processing VM network reservations')
         reservations = get_network_reservations(state)
 
-        instance = vm.instance
+        instance = vm_model.instance
         if instance
           bind_instance(instance, state, reservations)
         else
@@ -62,10 +62,10 @@ module Bosh::Director
           resource_pool = @deployment_plan.resource_pool(resource_pool_name)
           if resource_pool
             @logger.debug("Binding VM to resource pool '#{resource_pool_name}'")
-            bind_idle_vm(vm, resource_pool, state, reservations)
+            bind_idle_vm(vm_model, resource_pool, state, reservations)
           else
             @logger.debug("Resource pool '#{resource_pool_name}' does not exist, marking VM for deletion")
-            @deployment_plan.delete_vm(vm)
+            @deployment_plan.delete_vm(vm_model)
           end
         end
         @logger.debug('Finished processing VM network reservations')
@@ -73,36 +73,36 @@ module Bosh::Director
     end
 
     # Binds idle VM to a resource pool with a proper network reservation
-    # @param [Models::Vm] vm VM DB model
+    # @param [Models::Vm] vm_model VM DB model
     # @param [DeploymentPlan::ResourcePool] resource_pool Resource pool
     # @param [Hash] state VM state according to its agent
     # @param [Hash] reservations Network reservations
-    def bind_idle_vm(vm, resource_pool, state, reservations)
+    def bind_idle_vm(vm_model, resource_pool, state, reservations)
       if reservations.any? { |network_name, reservation| reservation.static? }
-        @logger.debug("Releasing all network reservations for VM `#{vm.cid}'")
+        @logger.debug("Releasing all network reservations for VM `#{vm_model.cid}'")
         reservations.each do |network_name, reservation|
-          @logger.debug("Releasing #{reservation.type} network reservation `#{network_name}' for VM `#{vm.cid}'")
+          @logger.debug("Releasing #{reservation.type} network reservation `#{network_name}' for VM `#{vm_model.cid}'")
           resource_pool.network.release(reservation)
         end
 
-        @logger.debug("Deleting VM `#{vm.cid}' with static network reservation")
-        @deployment_plan.delete_vm(vm)
+        @logger.debug("Deleting VM `#{vm_model.cid}' with static network reservation")
+        @deployment_plan.delete_vm(vm_model)
         return
       end
 
-      @logger.debug("Adding VM `#{vm.cid}' to resource pool `#{resource_pool.name}'")
+      @logger.debug("Adding VM `#{vm_model.cid}' to resource pool `#{resource_pool.name}'")
       idle_vm = resource_pool.add_idle_vm
-      idle_vm.vm = vm
+      idle_vm.model = vm_model
       idle_vm.current_state = state
 
       network_name = resource_pool.network.name
       reservation = reservations[network_name]
       if reservation
         @logger.debug("Using existing `#{reservation.type}' " +
-          "network reservation of `#{reservation.ip}' for VM `#{vm.cid}'")
+          "network reservation of `#{reservation.ip}' for VM `#{vm_model.cid}'")
         idle_vm.use_reservation(reservation)
       else
-        @logger.debug("No network reservation for VM `#{vm.cid}'")
+        @logger.debug("No network reservation for VM `#{vm_model.cid}'")
       end
     end
 
@@ -139,15 +139,8 @@ module Bosh::Director
         return
       end
 
-      @logger.debug("Found job instance `#{instance_name}'")
-      instance.use_model(instance_model)
-      instance.current_state = state
-
-      @logger.debug("Copying job instance `#{instance_name}' network reservations")
-      instance.take_network_reservations(reservations)
-
-      @logger.debug("Copying job instance `#{instance_name}' resource pool reservation")
-      job.resource_pool.mark_active_vm
+      @logger.debug("Found existing job instance `#{instance_name}'")
+      instance.bind_existing_instance(instance_model, state, reservations)
     end
 
     def get_network_reservations(state)
@@ -163,16 +156,16 @@ module Bosh::Director
       reservations
     end
 
-    def get_state(vm)
-      @logger.debug("Requesting current VM state for: #{vm.agent_id}")
-      agent = AgentClient.with_defaults(vm.agent_id)
+    def get_state(vm_model)
+      @logger.debug("Requesting current VM state for: #{vm_model.agent_id}")
+      agent = AgentClient.with_defaults(vm_model.agent_id)
       state = agent.get_state
 
       @logger.debug("Received VM state: #{state.pretty_inspect}")
-      verify_state(vm, state)
+      verify_state(vm_model, state)
       @logger.debug('Verified VM state')
 
-      migrate_legacy_state(vm, state)
+      migrate_legacy_state(vm_model, state)
       state.delete('release')
       if state.include?('job')
         state['job'].delete('release')
@@ -180,21 +173,21 @@ module Bosh::Director
       state
     end
 
-    def verify_state(vm, state)
-      instance = vm.instance
+    def verify_state(vm_model, state)
+      instance = vm_model.instance
 
-      if instance && instance.deployment_id != vm.deployment_id
+      if instance && instance.deployment_id != vm_model.deployment_id
         # Both VM and instance should reference same deployment
         raise VmInstanceOutOfSync,
-              "VM `#{vm.cid}' and instance " +
+              "VM `#{vm_model.cid}' and instance " +
               "`#{instance.job}/#{instance.index}' " +
               "don't belong to the same deployment"
       end
 
       unless state.kind_of?(Hash)
-        @logger.error("Invalid state for `#{vm.cid}': #{state.pretty_inspect}")
+        @logger.error("Invalid state for `#{vm_model.cid}': #{state.pretty_inspect}")
         raise AgentInvalidStateFormat,
-              "VM `#{vm.cid}' returns invalid state: " +
+              "VM `#{vm_model.cid}' returns invalid state: " +
               "expected Hash, got #{state.class}"
       end
 
@@ -203,7 +196,7 @@ module Bosh::Director
 
       if actual_deployment_name != expected_deployment_name
         raise AgentWrongDeployment,
-              "VM `#{vm.cid}' is out of sync: " +
+              "VM `#{vm_model.cid}' is out of sync: " +
                 'expected to be a part of deployment ' +
               "`#{expected_deployment_name}' " +
                 'but is actually a part of deployment ' +
@@ -215,7 +208,7 @@ module Bosh::Director
 
       if instance.nil? && !actual_job.nil?
         raise AgentUnexpectedJob,
-              "VM `#{vm.cid}' is out of sync: " +
+              "VM `#{vm_model.cid}' is out of sync: " +
               "it reports itself as `#{actual_job}/#{actual_index}' but " +
                 'there is no instance reference in DB'
       end
@@ -237,22 +230,22 @@ module Bosh::Director
           end
         else
           raise AgentJobMismatch,
-                "VM `#{vm.cid}' is out of sync: " +
+                "VM `#{vm_model.cid}' is out of sync: " +
                 "it reports itself as `#{actual_job}/#{actual_index}' but " +
                 "according to DB it is `#{instance.job}/#{instance.index}'"
         end
       end
     end
 
-    def migrate_legacy_state(vm, state)
+    def migrate_legacy_state(vm_model, state)
       # Persisting apply spec for VMs that were introduced before we started
       # persisting it on apply itself (this is for cloudcheck purposes only)
-      if vm.apply_spec.nil?
+      if vm_model.apply_spec.nil?
         # The assumption is that apply_spec <=> VM state
-        vm.update(:apply_spec => state)
+        vm_model.update(:apply_spec => state)
       end
 
-      instance = vm.instance
+      instance = vm_model.instance
       if instance
         disk_size = state['persistent_disk'].to_i
         persistent_disk = instance.persistent_disk
@@ -354,12 +347,12 @@ module Bosh::Director
 
       @event_log.begin_stage('Deleting unneeded VMs', unneeded_vms.size)
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
-        unneeded_vms.each do |vm|
+        unneeded_vms.each do |vm_model|
           pool.process do
-            @event_log.track(vm.cid) do
-              @logger.info("Delete unneeded VM #{vm.cid}")
-              @cloud.delete_vm(vm.cid)
-              vm.destroy
+            @event_log.track(vm_model.cid) do
+              @logger.info("Delete unneeded VM #{vm_model.cid}")
+              @cloud.delete_vm(vm_model.cid)
+              vm_model.destroy
             end
           end
         end

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

@@ -118,7 +118,7 @@ module Bosh::Director
             job_spec.recursive_merge!(state_overrides)
           end
 
-          @deployment.add_job(Job.parse(@deployment, job_spec, @event_log))
+          @deployment.add_job(Job.parse(@deployment, job_spec, @event_log, @logger))
         end
       end
     end

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

@@ -29,10 +29,10 @@ module Bosh::Director
       attr_accessor :state
 
       # @return [Hash] current state as provided by the BOSH Agent
-      attr_accessor :current_state
+      attr_reader :current_state
 
-      # @return [DeploymentPlan::IdleVm] Associated resource pool VM
-      attr_reader :idle_vm
+      # @return [DeploymentPlan::Vm] Associated resource pool VM
+      attr_reader :vm
 
       # @return [Boolean] true if this instance needs to be recreated
       attr_accessor :recreate
@@ -40,18 +40,18 @@ module Bosh::Director
       # @return [Boolean] true if this instance needs to be restarted
       attr_accessor :restart
 
-      ##
       # Creates a new instance specification based on the job and index.
-      #
       # @param [DeploymentPlan::Job] job associated job
       # @param [Integer] index index for this instance
-      def initialize(job, index)
+      def initialize(job, index, logger)
         @job = job
         @index = index
+        @logger = logger
+
         @model = nil
         @configuration_hash = nil
         @template_hashes = nil
-        @idle_vm = nil
+        @vm = nil
         @current_state = nil
 
         @network_reservations = {}
@@ -72,33 +72,84 @@ module Bosh::Director
         "#{@job.name}/#{@index}"
       end
 
-      # @param [Models::Instance] model Instance DB model
-      # @return [void]
-      def use_model(model)
-        if @model
-          raise DirectorError, 'Instance model is already bound'
-        end
-        @model = model
-      end
-
-      # Looks up a DB model for this instance, creates one if doesn't exist
-      # yet.
+      # Looks up a DB model for this instance, creates one if doesn't exist yet.
       # @return [void]
       def bind_model
         @model ||= find_or_create_model
       end
 
       # Looks up instance model in DB and binds it to this instance spec.
-      # Instance model is created if it's not found in DB. New idle VM is
+      # Instance model is created if it's not found in DB. New VM is
       # allocated if instance DB record doesn't reference one.
       # @return [void]
       def bind_unallocated_vm
         bind_model
         if @model.vm.nil?
-          allocate_idle_vm
+          allocate_vm
+        end
+      end
+
+      ##
+      # Updates this domain object to reflect an existing instance running on an existing vm
+      def bind_existing_instance(instance_model, state, reservations)
+        raise DirectorError, "Instance `#{self}' model is already bound" if @model
+        @model = instance_model
+        @current_state = state
+
+        take_network_reservations(reservations)
+        add_allocated_vm(instance_model.vm, state)
+      end
+
+      def apply_partial_vm_state
+        @logger.info('Applying partial VM state')
+
+        state = @vm.current_state
+        state['job'] = job.spec
+        state['index'] = index
+
+        # Apply the assignment to the VM
+        agent = AgentClient.with_defaults(@vm.model.agent_id)
+        agent.apply(state)
+
+        # Our assumption here is that director database access
+        # is much less likely to fail than VM agent communication
+        # so we only update database after we see a successful agent apply.
+        # If database update fails subsequent deploy will try to
+        # assign a new VM to this instance which is ok.
+        @vm.model.db.transaction do
+          @vm.model.update(:apply_spec => state)
+          @model.update(:vm => @vm.model)
+        end
+
+        @current_state = state
+      end
+
+      def apply_vm_state
+        @logger.info('Applying VM state')
+
+        state = {
+          'deployment' => @job.deployment.name,
+          'networks' => network_settings,
+          'resource_pool' => @job.resource_pool.spec,
+          'job' => @job.spec,
+          'index' => @index,
+        }
+
+        if disk_size > 0
+          state['persistent_disk'] = disk_size
         end
+
+        @model.vm.update(:apply_spec => state)
+
+        agent = AgentClient.with_defaults(@model.vm.agent_id)
+        agent.apply(state)
+
+        # Agent will potentially return modified version of state
+        # with resolved dynamic networks information
+        @current_state = agent.get_state
       end
 
+      ##
       # Syncs instance state with instance model in DB. This is needed because
       # not all instance states are available in the deployment manifest and we
       # we cannot really persist this data in the agent state (as VM might be
@@ -138,18 +189,6 @@ module Bosh::Director
         @network_reservations[name] = reservation
       end
 
-      ##
-      # Take any existing valid network reservations
-      #
-      # @param [Hash<String, NetworkReservation>] reservations
-      # @return [void]
-      def take_network_reservations(reservations)
-        reservations.each do |name, provided_reservation|
-          reservation = @network_reservations[name]
-          reservation.take(provided_reservation) if reservation
-        end
-      end
-
       ##
       # @return [Hash] BOSH network settings used for Agent apply call
       def network_settings
@@ -220,8 +259,7 @@ module Bosh::Director
       end
 
       ##
-      # @return [Boolean] returns true if the persistent disk is attached to the
-      #   VM
+      # @return [Boolean] returns true if the persistent disk is attached to the VM
       def disk_currently_attached?
         current_state['persistent_disk'].to_i > 0
       end
@@ -233,8 +271,7 @@ module Bosh::Director
       end
 
       ##
-      # @return [Boolean] returns true if the expected resource pool differs
-      #   from the one provided by the VM
+      # @return [Boolean] returns true if the expected resource pool differs from the one provided by the VM
       def resource_pool_changed?
         if @recreate || @job.deployment.recreate
           return true
@@ -251,8 +288,7 @@ module Bosh::Director
         # doesn't persist VM env to the version that does, there needs to
         # be at least one deployment that recreates all VMs before the following
         # code path gets exercised.
-        if @model && @model.vm && @model.vm.env &&
-          @job.resource_pool.env != @model.vm.env
+        if @model && @model.vm && @model.vm.env && @job.resource_pool.env != @model.vm.env
           return true
         end
 
@@ -270,6 +306,8 @@ module Bosh::Director
       # @return [Boolean] returns true if the expected job configuration differs
       #   from the one provided by the VM
       def job_changed?
+        return true if @current_state.nil?
+
         job_spec = @job.spec
         if job_spec != @current_state['job']
           # The agent job spec could be in legacy form.  job_spec cannot be,
@@ -330,8 +368,7 @@ module Bosh::Director
       end
 
       ##
-      # @return [Set<Symbol>] returns a set of all of the specification
-      #   differences
+      # @return [Set<Symbol>] returns a set of all of the specification differences
       def changes
         changes = Set.new
         unless @state == 'detached' && @current_state.nil?
@@ -351,7 +388,6 @@ module Bosh::Director
       ##
       # Instance spec that's passed to the VM during the BOSH Agent apply call.
       # It's what's used for comparing the expected vs the actual state.
-      #
       # @return [Hash<String, Object>] instance spec
       def spec
         spec = {
@@ -399,31 +435,57 @@ module Bosh::Director
         end
       end
 
-      # Allocates an idle VM in this job resource pool and binds current
-      # instance to that idle VM.
+      # Allocates an VM in this job resource pool and binds current instance to that VM.
       # @return [void]
-      def allocate_idle_vm
+      def allocate_vm
         resource_pool = @job.resource_pool
-        idle_vm = resource_pool.allocate_vm
+        vm = resource_pool.allocate_vm
         network = resource_pool.network
 
-        if idle_vm.vm
+        if vm.model
           # There's already a resource pool VM that can become our instance,
           # so we can try to reuse its reservation
           instance_reservation = @network_reservations[network.name]
           if instance_reservation
-            instance_reservation.take(idle_vm.network_reservation)
+            instance_reservation.take(vm.network_reservation)
           end
         else
           # VM is not created yet: let's just make it reference this instance
           # so later it knows what it needs to become
-          idle_vm.bound_instance = self
+          vm.bound_instance = self
+
           # this also means we no longer need previous VM network reservation
           # (instance has its own)
-          idle_vm.release_reservation
+          vm.release_reservation
         end
 
-        @idle_vm = idle_vm
+        @vm = vm
+      end
+
+      private
+
+      ##
+      # Take any existing valid network reservations
+      # @param [Hash<String, NetworkReservation>] reservations
+      # @return [void]
+      def take_network_reservations(reservations)
+        @logger.debug("Copying job instance `#{self}' network reservations")
+        reservations.each do |name, provided_reservation|
+          reservation = @network_reservations[name]
+          reservation.take(provided_reservation) if reservation
+        end
+      end
+
+      def add_allocated_vm(vm_model, state)
+        resource_pool = @job.resource_pool
+        vm = resource_pool.add_allocated_vm
+
+        @logger.debug("Found VM `#{vm_model.cid}' running job instance `#{self}' in resource pool `#{resource_pool.name}'")
+        vm.model = vm_model
+        vm.bound_instance = self
+        vm.current_state = state
+
+        @vm = vm
       end
     end
   end

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

@@ -25,35 +25,13 @@ module Bosh::Director
 
       ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
         unbound_instances.each do |instance|
-          pool.process { bind_instance_vm(instance) }
+          pool.process do
+            @event_log.track("#{instance.job.name}/#{instance.index}") do
+              instance.apply_partial_vm_state
+            end
+          end
         end
       end
     end
-
-    # @param [DeploymentPlan::Instance] instance
-    def bind_instance_vm(instance)
-      @event_log.track("#{instance.job.name}/#{instance.index}") do
-        idle_vm = instance.idle_vm
-
-        # Apply the assignment to the VM
-        agent = AgentClient.with_defaults(idle_vm.vm.agent_id)
-        state = idle_vm.current_state
-        state['job'] = instance.job.spec
-        state['index'] = instance.index
-        agent.apply(state)
-
-        # Our assumption here is that director database access
-        # is much less likely to fail than VM agent communication
-        # so we only update database after we see a successful agent apply.
-        # If database update fails subsequent deploy will try to
-        # assign a new VM to this instance which is ok.
-        idle_vm.vm.db.transaction do
-          idle_vm.vm.update(:apply_spec => state)
-          instance.model.update(:vm => idle_vm.vm)
-        end
-
-        instance.current_state = state
-      end
-    end
   end
 end

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

@@ -68,12 +68,13 @@ module Bosh::Director
 
       attr_accessor :all_properties
 
-      # @param [Bosh::Director::DeploymentPlan::Planner]
-      #   deployment Deployment plan
+      # @param [Bosh::Director::DeploymentPlan::Planner] deployment Deployment plan
       # @param [Hash] job_spec Raw job spec from the deployment manifest
+      # @param [Bosh::Director::EventLog::Log] event_log Event log for recording deprecations
+      # @param [Logger] logger Log for director logging
       # @return [Bosh::Director::DeploymentPlan::Job]
-      def self.parse(deployment, job_spec, event_log)
-        parser = JobSpecParser.new(deployment, event_log)
+      def self.parse(deployment, job_spec, event_log, logger)
+        parser = JobSpecParser.new(deployment, event_log, logger)
         parser.parse(job_spec)
       end
 
@@ -234,9 +235,7 @@ module Bosh::Director
             unless reservation.reserved?
               network = @deployment.network(net_name)
               network.reserve!(reservation, "`#{name}/#{instance.index}'")
-              if instance.idle_vm
-                instance.idle_vm.use_reservation(reservation)
-              end
+              instance.vm.use_reservation(reservation) if instance.vm
             end
           end
         end

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

@@ -9,9 +9,10 @@ module Bosh::Director
       include IpUtil
 
       # @param [Bosh::Director::DeploymentPlan] deployment Deployment plan
-      def initialize(deployment, event_log)
+      def initialize(deployment, event_log, logger)
         @deployment = deployment
         @event_log = event_log
+        @logger = logger
       end
 
       # @param [Hash] job_spec Raw job spec from the deployment manifest
@@ -222,7 +223,7 @@ module Bosh::Director
           @job.resource_pool.reserve_capacity(job_size)
         end
         job_size.times do |index|
-          @job.instances[index] = Instance.new(@job, index)
+          @job.instances[index] = Instance.new(@job, index, @logger)
         end
       end
 

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

@@ -32,9 +32,6 @@ module Bosh::Director
       # @return [Array<DeploymentPlan::IdleVm] List of allocated idle VMs
       attr_reader :allocated_vms
 
-      # @return [Integer] Number of active resource pool VMs
-      attr_reader :active_vm_count
-
       # @return [Integer] Number of VMs reserved
       attr_reader :reserved_capacity
 
@@ -68,7 +65,6 @@ module Bosh::Director
 
         @idle_vms = []
         @allocated_vms = []
-        @active_vm_count = 0
         @reserved_capacity = 0
         @reserved_errand_capacity = 0
       end
@@ -83,7 +79,7 @@ module Bosh::Director
         }
       end
 
-      # Creates IdleVm objects for any missing resource pool VMs and reserves
+      # Creates idle VMs for any missing resource pool VMs and reserves
       # dynamic networks for all idle VMs.
       # @return [void]
       def process_idle_vms
@@ -107,34 +103,40 @@ module Bosh::Director
         reservation
       end
 
-      # Adds a new VM to a list of managed idle VMs
+      # Adds a new VM to idle_vms
       def add_idle_vm
-        idle_vm = IdleVm.new(self)
+        @logger.info("ResourcePool `#{name}' - Adding idle VM (index=#{@idle_vms.size})")
+        idle_vm = Vm.new(self)
         @idle_vms << idle_vm
         idle_vm
       end
 
       def allocate_vm
-        if @idle_vms.empty?
-          if dynamically_sized?
-            add_idle_vm
-          else
-            raise ResourcePoolNotEnoughCapacity,
-                  "Resource pool `#{@name}' has no more VMs to allocate"
-          end
+        if @idle_vms.empty? && dynamically_sized?
+          vm = Vm.new(self)
+        else
+          vm = @idle_vms.pop
+          raise ResourcePoolNotEnoughCapacity, "Resource pool `#{@name}' has no more VMs to allocate" if vm.nil?
         end
-        allocated_vm = @idle_vms.pop
-        @allocated_vms << allocated_vm
-        allocated_vm
+
+        add_allocated_vm(vm)
+      end
+
+      # Adds an existing VM to allocated_vms
+      def add_allocated_vm(vm=nil)
+        vm ||= Vm.new(self)
+        @logger.info("ResourcePool `#{name}' - Adding allocated VM (index=#{@allocated_vms.size})")
+        @allocated_vms << vm
+        vm
       end
 
-      def deallocate_vm(idle_vm_cid)
-        deallocated_vm = @allocated_vms.find { |idle_vm| idle_vm.vm.cid == idle_vm_cid }
+      def deallocate_vm(vm_cid)
+        deallocated_vm = @allocated_vms.find { |vm| vm.model.cid == vm_cid }
         if deallocated_vm.nil?
-          raise DirectorError, "Resource pool `#{@name}' does not contain an allocated VM with the cid `#{idle_vm_cid}'"
+          raise DirectorError, "Resource pool `#{@name}' does not contain an allocated VM with the cid `#{vm_cid}'"
         end
 
-        @logger.info("Deallocating VM: #{deallocated_vm.vm.cid}")
+        @logger.info("ResourcePool `#{name}' - Deallocating VM: #{deallocated_vm.model.cid}")
         @allocated_vms.delete(deallocated_vm)
 
         add_idle_vm unless dynamically_sized? # don't refill if dynamically sized
@@ -142,12 +144,6 @@ module Bosh::Director
         nil
       end
 
-      # "Active" VM is a VM that is currently running a job
-      # @return [void]
-      def mark_active_vm
-        @active_vm_count += 1
-      end
-
       # Checks if there is enough capacity to run _extra_ N VMs,
       # raise error if not enough capacity
       # @raise [ResourcePoolNotEnoughCapacity]
@@ -177,18 +173,26 @@ module Bosh::Director
         end
       end
 
-      def dynamically_sized?
-        @size.nil?
+      # Returns a number of VMs that need to be deleted in order to bring
+      # this resource pool to the desired size
+      # @return [Integer]
+      def extra_vm_count
+        return 0 if dynamically_sized?
+        @idle_vms.size + @allocated_vms.size - @size
       end
 
       private
 
+      def dynamically_sized?
+        @size.nil?
+      end
+
       # Returns a number of VMs that need to be created in order to bring
-      # this resource pool to a desired size
+      # this resource pool to the desired size
       # @return [Integer]
       def missing_vm_count
         return 0 if dynamically_sized?
-        @size - @active_vm_count - @idle_vms.size
+        @size - @allocated_vms.size - @idle_vms.size
       end
     end
   end

data/lib/bosh/director/deployment_plan/{idle_vm.rb → vm.rb}

@@ -7,15 +7,15 @@ module Bosh::Director
     # reserved for an instance to minimize the number of CPI operations
     # (network & storage) required for the VM to match the instance
     # requirements.
-    class IdleVm
+    class Vm
       # @return [DeploymentPlan::ResourcePool] Associated resource pool
       attr_reader :resource_pool
 
       # @return [NetworkReservation] VM network reservation
       attr_accessor :network_reservation
 
-      # @return [Models::Vm] Associated model
-      attr_accessor :vm
+      # @return [Models::Vm] Associated DB model
+      attr_accessor :model
 
       # @return [Hash] Current state as provided by the BOSH Agent
       attr_writer :current_state
@@ -38,7 +38,7 @@ module Bosh::Director
         @current_state = nil
         @bound_instance = nil
         @network_reservation = nil
-        @vm = nil
+        @model = nil
       end
 
       #
@@ -98,7 +98,7 @@ module Bosh::Director
       def resource_pool_changed?
         return true if resource_pool.spec != @current_state['resource_pool']
         return true if resource_pool.deployment_plan.recreate
-        return true if @vm && @vm.env != resource_pool.env
+        return true if @model && @model.env != resource_pool.env
 
         false
       end
@@ -110,8 +110,9 @@ module Bosh::Director
         resource_pool_changed? || networks_changed?
       end
 
+      #TODO: rename 'clean'
       def clean_vm
-        self.vm = nil
+        self.model = nil
         self.current_state = nil
       end
     end

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

@@ -52,7 +52,7 @@ module Bosh::Director
     # @return [void]
     def deallocate_vms
       @logger.info('Deallocating errand VMs')
-      instance_vm_cids = @job.instances.map { |i| i.model.vm.cid }
+      instance_vm_cids = @job.instances.map { |instance| instance.model.vm.cid }
       instance_vm_cids.each { |cid| @job.resource_pool.deallocate_vm(cid) }
     end
   end

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

@@ -42,8 +42,8 @@ module Bosh::Director
         end
       end
 
-      vm_state_applier = VmStateApplier.new(@instance, @vm_model, @agent_client, @job_renderer, @logger)
-      vm_state_applier.apply
+      @instance.apply_vm_state
+      @job_renderer.render_job_instance(@instance)
 
       [@vm_model, @agent_client]
     end
@@ -183,41 +183,5 @@ module Bosh::Director
         @cloud.detach_disk(@vm_model.cid, @instance.model.persistent_disk_cid)
       end
     end
-
-    class VmStateApplier
-      def initialize(instance, vm_model, agent_client, job_renderer, logger)
-        @instance = instance
-        @vm_model = vm_model
-        @agent_client = agent_client
-        @job_renderer = job_renderer
-        @logger = logger
-      end
-
-      def apply
-        @logger.info('Applying VM state')
-
-        state = {
-          'deployment' => @instance.job.deployment.name,
-          'networks' => @instance.network_settings,
-          'resource_pool' => @instance.job.resource_pool.spec,
-          'job' => @instance.job.spec,
-          'index' => @instance.index,
-        }
-
-        if @instance.disk_size > 0
-          state['persistent_disk'] = @instance.disk_size
-        end
-
-        @vm_model.update(:apply_spec => state)
-
-        @agent_client.apply(state)
-
-        # Agent will potentially return modified version of state
-        # with resolved dynamic networks information
-        @instance.current_state = @agent_client.get_state
-
-        @job_renderer.render_job_instance(@instance)
-      end
-    end
   end
 end

data/lib/bosh/director/resource_pool_updater.rb

@@ -12,26 +12,26 @@ module Bosh::Director
     #
     # @param [ThreadPool] thread_pool Thread pool that will be used to
     #   parallelize the operation
-    # @yield [idle_vm] filter for which missing VMs to create
+    # @yield [VirtualMachine] filter for which missing VMs to create
     def create_missing_vms(thread_pool)
       counter = 0
       vms_to_process = []
 
-      each_idle_vm do |idle_vm|
-        next if idle_vm.vm
-        if !block_given? || yield(idle_vm)
+      each_vm do |vm|
+        next if vm.model
+        if !block_given? || yield(vm)
           counter += 1
-          vms_to_process << idle_vm
+          vms_to_process << vm
         end
       end
 
       @logger.info("Creating #{counter} missing VMs")
-      vms_to_process.each_with_index do |idle_vm, index|
+      vms_to_process.each_with_index do |vm, index|
         thread_pool.process do
           @event_log.track("#{@resource_pool.name}/#{index}") do
             with_thread_name("create_missing_vm(#{@resource_pool.name}, #{index}/#{counter})") do
               @logger.info("Creating missing VM")
-              create_missing_vm(idle_vm)
+              create_missing_vm(vm)
             end
           end
         end
@@ -41,60 +41,60 @@ module Bosh::Director
     # Creates missing VMs that have bound instances
     # (as opposed to missing resource pool VMs)
     def create_bound_missing_vms(thread_pool)
-      create_missing_vms(thread_pool) { |idle_vm| !idle_vm.bound_instance.nil? }
+      create_missing_vms(thread_pool) { |vm| !vm.bound_instance.nil? }
     end
 
-    def create_missing_vm(idle_vm)
+    def create_missing_vm(vm)
       deployment = @resource_pool.deployment_plan.model
       stemcell = @resource_pool.stemcell.model
 
-      vm = VmCreator.new.create(deployment, stemcell, @resource_pool.cloud_properties,
-                                idle_vm.network_settings, nil, @resource_pool.env)
+      vm_model = VmCreator.new.create(deployment, stemcell, @resource_pool.cloud_properties,
+                                vm.network_settings, nil, @resource_pool.env)
 
-      agent = AgentClient.with_defaults(vm.agent_id)
+      agent = AgentClient.with_defaults(vm_model.agent_id)
       agent.wait_until_ready
 
-      update_state(agent, vm, idle_vm)
+      update_state(agent, vm_model, vm)
 
-      idle_vm.vm = vm
-      idle_vm.current_state = agent.get_state
+      vm.model = vm_model
+      vm.current_state = agent.get_state
     rescue Exception => e
       @logger.info("Cleaning up the created VM due to an error: #{e}")
       begin
-        @cloud.delete_vm(vm.cid) if vm && vm.cid
-        vm.destroy if vm && vm.id
+        @cloud.delete_vm(vm_model.cid) if vm_model && vm_model.cid
+        vm_model.destroy if vm_model && vm_model.id
       rescue Exception
-        @logger.info("Could not cleanup VM: #{vm.cid}") if vm
+        @logger.info("Could not cleanup VM: #{vm_model.cid}") if vm_model
       end
       raise e
     end
 
-    def update_state(agent, vm, idle_vm)
+    def update_state(agent, vm_model, vm)
       state = {
           "deployment" => @resource_pool.deployment_plan.name,
           "resource_pool" => @resource_pool.spec,
-          "networks" => idle_vm.network_settings
+          "networks" => vm.network_settings
       }
 
-      vm.update(:apply_spec => state)
+      vm_model.update(:apply_spec => state)
       agent.apply(state)
     end
 
     # Deletes extra VMs in a resource pool
     # @param thread_pool Thread pool used to parallelize delete operations
     def delete_extra_vms(thread_pool)
-      count = extra_vm_count
+      count = @resource_pool.extra_vm_count
       @logger.info("Deleting #{count} extra VMs")
 
       count.times do
-        idle_vm = @resource_pool.idle_vms.shift
-        vm_cid = idle_vm.vm.cid
+        vm = @resource_pool.idle_vms.shift
+        vm_cid = vm.model.cid
 
         thread_pool.process do
           @event_log.track("#{@resource_pool.name}/#{vm_cid}") do
             @logger.info("Deleting extra VM: #{vm_cid}")
             @cloud.delete_vm(vm_cid)
-            idle_vm.vm.destroy
+            vm.model.destroy
           end
         end
       end
@@ -107,9 +107,9 @@ module Bosh::Director
 
       @logger.info("Deleting #{count} outdated idle VMs")
 
-      @resource_pool.idle_vms.each do |idle_vm|
-        next unless idle_vm.vm && idle_vm.changed?
-        vm_cid = idle_vm.vm.cid
+      @resource_pool.idle_vms.each do |vm|
+        next unless vm.model && vm.changed?
+        vm_cid = vm.model.cid
 
         thread_pool.process do
           @event_log.track("#{@resource_pool.name}/#{vm_cid}") do
@@ -118,9 +118,9 @@ module Bosh::Director
             with_thread_name("delete_outdated_vm(#{@resource_pool.name}, #{index - 1}/#{count})") do
               @logger.info("Deleting outdated VM: #{vm_cid}")
               @cloud.delete_vm(vm_cid)
-              vm = idle_vm.vm
-              idle_vm.clean_vm
-              vm.destroy
+              vm_model = vm.model
+              vm.clean_vm
+              vm_model.destroy
             end
           end
         end
@@ -134,8 +134,8 @@ module Bosh::Director
     def reserve_networks
       network = @resource_pool.network
 
-      each_idle_vm_with_index do |idle_vm, index|
-        unless idle_vm.network_reservation
+      each_vm_with_index do |vm, index|
+        unless vm.network_reservation
           reservation = NetworkReservation.new(
               :type => NetworkReservation::DYNAMIC)
           network.reserve(reservation)
@@ -153,7 +153,7 @@ module Bosh::Director
             end
           end
 
-          idle_vm.network_reservation = reservation
+          vm.network_reservation = reservation
         end
       end
     end
@@ -162,39 +162,35 @@ module Bosh::Director
       SecureRandom.uuid
     end
 
-    def each_idle_vm
-      @resource_pool.allocated_vms.each { |idle_vm| yield idle_vm }
-      @resource_pool.idle_vms.each { |idle_vm| yield idle_vm }
+    def each_vm
+      @resource_pool.allocated_vms.each { |vm| yield vm }
+      @resource_pool.idle_vms.each { |vm| yield vm }
     end
 
-    def each_idle_vm_with_index
+    def each_vm_with_index
       index = 0
-      each_idle_vm do |idle_vm|
-        yield(idle_vm, index)
+      each_vm do |vm|
+        yield(vm, index)
         index += 1
       end
     end
 
     def extra_vm_count
-      return 0 if @resource_pool.dynamically_sized?
-      @resource_pool.active_vm_count +
-          @resource_pool.idle_vms.size +
-          @resource_pool.allocated_vms.size -
-          @resource_pool.size
+      @resource_pool.extra_vm_count
     end
 
     def outdated_idle_vm_count
       counter = 0
-      @resource_pool.idle_vms.each do |idle_vm|
-        counter += 1 if idle_vm.vm && idle_vm.changed?
+      @resource_pool.idle_vms.each do |vm|
+        counter += 1 if vm.model && vm.changed?
       end
       counter
     end
 
     def missing_vm_count
       counter = 0
-      each_idle_vm do |idle_vm|
-        next if idle_vm.vm
+      each_vm do |vm|
+        next if vm.model
         counter += 1
       end
       counter
@@ -202,9 +198,9 @@ module Bosh::Director
 
     def bound_missing_vm_count
       counter = 0
-      each_idle_vm do |idle_vm|
-        next if idle_vm.vm
-        next if idle_vm.bound_instance.nil?
+      each_vm do |vm|
+        next if vm.model
+        next if vm.bound_instance.nil?
         counter += 1
       end
       counter

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2619.0'
+    VERSION = '1.2624.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2619.0
+  version: 1.2624.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2619.0
+        version: 1.2624.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.0.beta.12
   type: :runtime
@@ -264,7 +264,7 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.5.0.beta.12
 - !ruby/object:Gem::Dependency
@@ -509,7 +509,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  a38edb'
+  03f604'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -621,7 +621,6 @@ files:
 - lib/bosh/director/deployment_plan/deployment_spec_parser.rb
 - lib/bosh/director/deployment_plan/dns_binder.rb
 - lib/bosh/director/deployment_plan/dynamic_network.rb
-- lib/bosh/director/deployment_plan/idle_vm.rb
 - lib/bosh/director/deployment_plan/instance.rb
 - lib/bosh/director/deployment_plan/instance_vm_binder.rb
 - lib/bosh/director/deployment_plan/job.rb
@@ -640,6 +639,7 @@ files:
 - lib/bosh/director/deployment_plan/update_config.rb
 - lib/bosh/director/deployment_plan/updater.rb
 - lib/bosh/director/deployment_plan/vip_network.rb
+- lib/bosh/director/deployment_plan/vm.rb
 - lib/bosh/director/dns_helper.rb
 - lib/bosh/director/download_helper.rb
 - lib/bosh/director/duration.rb
@@ -770,7 +770,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2708480471074860052
+      hash: -2871542120814616469
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23.2