bosh-director 1.3173.0 → 1.3177.0

data/lib/bosh/director/problem_scanner/disk_scan_stage.rb

@@ -52,10 +52,7 @@ module Bosh::Director::ProblemScanner
       end
 
       disk_cid = disk.disk_cid
-      vm_cid = nil
-      if disk.instance && disk.instance.vm
-        vm_cid = disk.instance.vm.cid
-      end
+      vm_cid = disk.instance.vm_cid if disk.instance
 
       if vm_cid.nil?
         # With the db dependencies this should not happen.

data/lib/bosh/director/problem_scanner/problem_register.rb

@@ -40,16 +40,14 @@ module Bosh::Director::ProblemScanner
       end
     end
 
-    def get_vm_instance_and_disk(vm)
-      instance = nil
+    def get_disk(instance)
       mounted_disk_cid = nil
 
       @problem_lock.synchronize do
-        instance = vm.instance
         mounted_disk_cid = instance.persistent_disk_cid if instance
       end
 
-      [instance, mounted_disk_cid]
+      mounted_disk_cid
     end
   end
 end

data/lib/bosh/director/problem_scanner/scanner.rb

@@ -24,7 +24,7 @@ module Bosh::Director
 
             Models::DeploymentProblem.where(
               deployment: @deployment,
-              resource_id: instance.vm.id,
+              resource_id: instance.id,
               state: 'open'
             ).update(state: 'closed')
 

data/lib/bosh/director/problem_scanner/vm_scan_stage.rb

@@ -17,25 +17,22 @@ module Bosh::Director
 
     def scan(vms=nil)
       if vms
-        vm_list = []
-        vms.each do |job, index|
-          instance = @instance_manager.find_by_name(@deployment.name, job, index)
-          vm_list << instance.vm
+        instances = vms.map do |job, index|
+          @instance_manager.find_by_name(@deployment.name, job, index)
         end
-        vms = vm_list
       else
-        vms = Models::Vm.eager(:instance).filter(deployment: @deployment).all
+        instances = Models::Instance.filter(deployment: @deployment).exclude(vm_cid: nil).all
       end
 
-      @event_logger.begin_stage("Scanning #{vms.size} VMs", 2)
+      @event_logger.begin_stage("Scanning #{instances.size} VMs", 2)
       results = Hash.new(0)
       lock = Mutex.new
 
       @event_logger.track_and_log('Checking VM states') do
         ThreadPool.new(max_threads: Config.max_threads).wrap do |pool|
-          vms.each do |vm|
+          instances.each do |instance|
             pool.process do
-              scan_result = scan_vm(vm)
+              scan_result = scan_vm(instance)
               lock.synchronize { results[scan_result] += 1 }
             end
           end
@@ -50,17 +47,17 @@ module Bosh::Director
 
     private
 
-    def scan_vm(vm)
+    def scan_vm(instance)
       agent_options = {
         timeout: AGENT_TIMEOUT_IN_SECONDS,
         retry_methods: {get_state: 0}
       }
 
-      instance, mounted_disk_cid = @problem_register.get_vm_instance_and_disk(vm)
+      mounted_disk_cid = @problem_register.get_disk(instance)
 
-      agent = AgentClient.with_vm_credentials_and_agent_id(vm.credentials, vm.agent_id, agent_options)
+      agent = AgentClient.with_vm_credentials_and_agent_id(instance.credentials, instance.agent_id, agent_options)
       begin
-        state = agent.get_state
+        agent.get_state
 
         # gather mounted disk info. (used by scan_disk)
         begin
@@ -69,26 +66,25 @@ module Bosh::Director
         rescue Bosh::Director::RpcTimeout
           mounted_disk_cid = nil
         end
-        add_disk_owner(mounted_disk_cid, vm.cid) if mounted_disk_cid
+        add_disk_owner(mounted_disk_cid, instance.vm_cid) if mounted_disk_cid
 
-        return :unbound if is_unbound_instance_vm?(vm, instance, state)
         :ok
       rescue Bosh::Director::RpcTimeout
         # We add the disk to avoid a duplicate problem when timeouts fetching agent status (unresponsive_agent and
         # mount_info_mismatch)
-        add_disk_owner(mounted_disk_cid, vm.cid) if mounted_disk_cid
+        add_disk_owner(mounted_disk_cid, instance.vm_cid) if mounted_disk_cid
 
         begin
-          unless @cloud.has_vm?(vm.cid)
-            @logger.info("Missing VM #{vm.cid}")
-            @problem_register.problem_found(:missing_vm, vm)
+          if instance.vm_cid && !@cloud.has_vm?(instance.vm_cid)
+            @logger.info("Missing VM #{instance.vm_cid}")
+            @problem_register.problem_found(:missing_vm, instance)
             return :missing
           end
         rescue Bosh::Clouds::NotImplemented
         end
 
-        @logger.info("Found unresponsive agent #{vm.agent_id}")
-        @problem_register.problem_found(:unresponsive_agent, vm)
+        @logger.info("Found unresponsive agent #{instance.agent_id}")
+        @problem_register.problem_found(:unresponsive_agent, instance)
         :unresponsive
       end
     end
@@ -97,19 +93,5 @@ module Bosh::Director
       @agent_disks[disk_cid] ||= []
       @agent_disks[disk_cid] << vm_cid
     end
-
-    def is_unbound_instance_vm?(vm, instance, state)
-      job = state['job'] ? state['job']['name'] : nil
-      index = state['index']
-      if job && !instance
-        @logger.info("Found unbound VM #{vm.agent_id}")
-
-        @problem_register.problem_found(:unbound_instance_vm, vm,
-          job: job, index: index)
-        true
-      else
-        false
-      end
-    end
   end
 end

data/lib/bosh/director/stopper.rb

@@ -9,7 +9,7 @@ module Bosh::Director
     end
 
     def stop
-      return if @instance_model.compilation || @instance_model.vm.nil?
+      return if @instance_model.compilation || @instance_model.vm_cid.nil?
 
       if @instance_plan.skip_drain
         @logger.info("Skipping drain for '#{@instance_model}'")
@@ -23,7 +23,7 @@ module Bosh::Director
     private
 
     def agent_client
-      @agent_client ||= AgentClient.with_vm_credentials_and_agent_id(@instance_model.vm.credentials, @instance_model.vm.agent_id)
+      @agent_client ||= AgentClient.with_vm_credentials_and_agent_id(@instance_model.credentials, @instance_model.agent_id)
     end
 
     def perform_drain

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3173.0'
+    VERSION = '1.3177.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -23,7 +23,7 @@ module Bosh::Director
           instance = instance_plan.instance
 
           pool.process do
-            with_thread_name("create_missing_vm(#{instance}/#{total})") do
+            with_thread_name("create_missing_vm(#{instance.model}/#{total})") do
               event_log.track(instance.model.to_s) do
                 @logger.info('Creating missing VM')
                 disks = [instance.model.persistent_disk_cid].compact
@@ -45,10 +45,11 @@ module Bosh::Director
 
     def create_for_instance_plan(instance_plan, disks)
       instance = instance_plan.instance
+      instance_model = instance.model
       @logger.info('Creating VM')
 
-      vm_model = create(
-        instance.deployment_model,
+      create(
+        instance_model,
         instance.stemcell,
         instance.cloud_properties,
         instance_plan.network_settings_hash,
@@ -57,19 +58,18 @@ module Bosh::Director
       )
 
       begin
-        instance.bind_to_vm_model(vm_model)
-        VmMetadataUpdater.build.update(vm_model, {})
+        VmMetadataUpdater.build.update(instance_model, {})
 
-        agent_client = AgentClient.with_vm_credentials_and_agent_id(vm_model.credentials, vm_model.agent_id)
+        agent_client = AgentClient.with_vm_credentials_and_agent_id(instance_model.credentials, instance_model.agent_id)
         agent_client.wait_until_ready
         instance.update_trusted_certs
         instance.update_cloud_properties!
       rescue Exception => e
-        @logger.error("Failed to create/contact VM #{vm_model.cid}: #{e.inspect}")
+        @logger.error("Failed to create/contact VM #{instance_model.vm_cid}: #{e.inspect}")
         if Config.keep_unreachable_vms
-          @logger.info("Keeping the VM for debugging")
+          @logger.info('Keeping the VM for debugging')
         else
-          @vm_deleter.delete_for_instance_plan(instance_plan)
+          @vm_deleter.delete_for_instance(instance_model)
         end
         raise e
       end
@@ -93,19 +93,10 @@ module Bosh::Director
       end
     end
 
-    def create(deployment, stemcell, cloud_properties, network_settings, disks, env)
-      vm = nil
-      vm_cid = nil
-
-      env = Bosh::Common::DeepCopy.copy(env)
-
+    def create(instance_model, stemcell, cloud_properties, network_settings, disks, env)
       agent_id = self.class.generate_agent_id
-
-      options = {
-        :deployment => deployment,
-        :agent_id => agent_id,
-        :env => env
-      }
+      env = Bosh::Common::DeepCopy.copy(env)
+      options = {:agent_id => agent_id, :vm_env => env }
 
       if Config.encryption?
         credentials = generate_agent_credentials
@@ -124,24 +115,15 @@ module Bosh::Director
         raise e
       end
 
-      options[:cid] = vm_cid
-      vm = Models::Vm.new(options)
+      options[:vm_cid] = vm_cid
 
-      vm.save
-      vm
+      instance_model.update(options)
     rescue => e
       @logger.error("error creating vm: #{e.message}")
-      delete_vm(vm_cid) if vm_cid
-      vm.destroy if vm
+      @vm_deleter.delete_vm(vm_cid) if vm_cid
       raise e
     end
 
-    def delete_vm(vm_cid)
-      @cloud.delete_vm(vm_cid)
-    rescue => e
-      @logger.error("error cleaning up #{vm_cid}: #{e.message}\n#{e.backtrace.join("\n")}")
-    end
-
     def self.generate_agent_id
       SecureRandom.uuid
     end

data/lib/bosh/director/vm_deleter.rb

@@ -8,18 +8,16 @@ module Bosh::Director
       @error_ignorer = ErrorIgnorer.new(force, @logger)
     end
 
-    def delete_for_instance_plan(instance_plan)
-      instance_model = instance_plan.instance_model
-
-      if instance_model.vm
-        delete_vm(instance_model.vm)
+    def delete_for_instance(instance)
+      if instance.vm_cid
+        delete_vm(instance.vm_cid)
+        instance.update(vm_cid: nil, agent_id: nil, trusted_certs_sha1: nil, credentials: nil)
       end
     end
 
-    def delete_vm(vm_model)
+    def delete_vm(vm_cid)
       @logger.info('Deleting VM')
-      @error_ignorer.with_force_check { @cloud.delete_vm(vm_model.cid) }
-      vm_model.destroy
+      @error_ignorer.with_force_check { @cloud.delete_vm(vm_cid) }
     end
   end
 end

data/lib/bosh/director/vm_metadata_updater.rb

@@ -10,17 +10,15 @@ module Bosh::Director
       @logger = logger
     end
 
-    def update(vm, metadata)
+    def update(instance, metadata)
       if @cloud.respond_to?(:set_vm_metadata)
         metadata = metadata.merge(@director_metadata)
-        metadata[:deployment] = vm.deployment.name
+        metadata[:deployment] = instance.deployment.name
 
-        if vm.instance
-          metadata[:job] = vm.instance.job
-          metadata[:index] = vm.instance.index.to_s
-        end
+        metadata[:job] = instance.job
+        metadata[:index] = instance.index.to_s
 
-        @cloud.set_vm_metadata(vm.cid, metadata)
+        @cloud.set_vm_metadata(instance.vm_cid, metadata)
       end
     rescue Bosh::Clouds::NotImplemented => e
       @logger.debug(e.inspect)

data/lib/bosh/director/vm_recreator.rb

@@ -7,8 +7,9 @@ module Bosh::Director
     end
 
     def recreate_vm(instance_plan, disk_cid)
-      @vm_deleter.delete_for_instance_plan(instance_plan)
-      disks = [instance_plan.instance.model.persistent_disk_cid, disk_cid].compact
+      instance_model = instance_plan.instance.model
+      @vm_deleter.delete_for_instance(instance_model)
+      disks = [instance_model.persistent_disk_cid, disk_cid].compact
       @vm_creator.create_for_instance_plan(instance_plan, disks)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3173.0
+  version: 1.3177.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-07 00:00:00.000000000 Z
+date: 2016-01-11 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.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3173.0
+        version: 1.3177.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -655,6 +655,8 @@ files:
 - db/migrations/director/20151030222853_add_templates_to_instance.rb
 - db/migrations/director/20151031001039_add_spec_to_instance.rb
 - db/migrations/director/20151109190602_rename_orphan_columns.rb
+- db/migrations/director/20151229184742_add_vm_attributes_to_instance.rb
+- db/migrations/director/20160108191637_drop_vm_env_json_from_instance.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -777,6 +779,7 @@ files:
 - lib/bosh/director/deployment_plan/network_planner/planner.rb
 - lib/bosh/director/deployment_plan/network_planner/reservation_reconciler.rb
 - lib/bosh/director/deployment_plan/network_planner/vip_static_ips_planner.rb
+- lib/bosh/director/deployment_plan/network_reservation_repository.rb
 - lib/bosh/director/deployment_plan/network_settings.rb
 - lib/bosh/director/deployment_plan/notifier.rb
 - lib/bosh/director/deployment_plan/options/skip_drain.rb
@@ -800,7 +803,6 @@ files:
 - lib/bosh/director/deployment_plan/template.rb
 - lib/bosh/director/deployment_plan/update_config.rb
 - lib/bosh/director/deployment_plan/vip_network.rb
-- lib/bosh/director/deployment_plan/vm.rb
 - lib/bosh/director/deployment_plan/vm_type.rb
 - lib/bosh/director/disk_manager.rb
 - lib/bosh/director/dns/canonicalizer.rb
@@ -898,7 +900,6 @@ files:
 - lib/bosh/director/models/task.rb
 - lib/bosh/director/models/template.rb
 - lib/bosh/director/models/user.rb
-- lib/bosh/director/models/vm.rb
 - lib/bosh/director/nats_rpc.rb
 - lib/bosh/director/network_reservation.rb
 - lib/bosh/director/problem_handlers/base.rb