bosh-director 1.3173.0 → 1.3177.0

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

@@ -23,7 +23,7 @@ module Bosh::Director
         instances += migrated_from_instances
       end
 
-      instances
+      instances.uniq
     end
 
     private
@@ -33,7 +33,8 @@ module Bosh::Director
       migrated_from_instances = []
 
       migrated_from_jobs.each do |migrated_from_job|
-        if @deployment_plan.job(migrated_from_job.name)
+        existing_job = @deployment_plan.job(migrated_from_job.name)
+        if existing_job && existing_job.name != desired_job.name
           raise DeploymentInvalidMigratedFromJob,
             "Failed to migrate job '#{migrated_from_job.name}' to '#{desired_job_name}'. " +
               'A deployment can not migrate a job and also specify it. ' +

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

@@ -42,7 +42,7 @@ module Bosh::Director
           end
         end
 
-        dns_manager = DnsManager.create
+        dns_manager = DnsManagerProvider.create
         dns_spec = safe_property(subnet_spec, 'dns', :class => Array, :optional => true)
         dns = dns_manager.dns_servers(network_name, dns_spec)
 

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

@@ -6,13 +6,13 @@ module Bosh::Director::DeploymentPlan
       end
 
       def network_plan_with_dynamic_reservation(instance_plan, job_network)
-        reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance, job_network.deployment_network)
+        reservation = Bosh::Director::DesiredNetworkReservation.new_dynamic(instance_plan.instance.model, job_network.deployment_network)
         @logger.debug("Creating new dynamic reservation #{reservation} for instance '#{instance_plan.instance}'")
         Plan.new(reservation: reservation)
       end
 
       def network_plan_with_static_reservation(instance_plan, job_network, static_ip)
-        reservation = Bosh::Director::DesiredNetworkReservation.new_static(instance_plan.instance, job_network.deployment_network, static_ip)
+        reservation = Bosh::Director::DesiredNetworkReservation.new_static(instance_plan.instance.model, job_network.deployment_network, static_ip)
         @logger.debug("Creating new static reservation #{reservation} for instance '#{instance_plan.instance}'")
         Plan.new(reservation: reservation)
       end

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

@@ -0,0 +1,20 @@
+module Bosh::Director::DeploymentPlan
+  class NetworkReservationRepository
+    def initialize(deployment_plan, logger)
+      @deployment_plan = deployment_plan
+      @logger = logger
+    end
+
+    def fetch_network_reservations(existing_instance_model, existing_instance_state)
+      if existing_instance_model.ip_addresses.any?
+        InstanceNetworkReservations.create_from_db(existing_instance_model, @deployment_plan, @logger)
+      elsif existing_instance_state
+        # This is for backwards compatibility when we did not store
+        # network reservations in DB and constructed them from instance state
+        InstanceNetworkReservations.create_from_state(existing_instance_model, existing_instance_state, @deployment_plan, @logger)
+      else
+        InstanceNetworkReservations.new(@logger)
+      end
+    end
+  end
+end

data/lib/bosh/director/deployment_plan/placement_planner/static_ips_availability_zone_picker.rb

@@ -202,7 +202,8 @@ module Bosh
 
           def create_existing_instance_plan(desired_instance, existing_instance_model)
             if desired_instance.nil?
-              @instance_plan_factory.obsolete_instance_plan(existing_instance_model, desired_instance)
+              # potentially a code path that never happens. It had been sending 2 for 1 which should have EXPLODED!!!
+              @instance_plan_factory.obsolete_instance_plan(existing_instance_model)
             else
               @instance_plan_factory.desired_existing_instance_plan(existing_instance_model, desired_instance)
             end

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

@@ -43,9 +43,6 @@ module Bosh::Director
       # Job instances from the old manifest that are not in the new manifest
       attr_reader :unneeded_instances
 
-      # VMs from the old manifest that are not in the new manifest
-      attr_accessor :unneeded_vms
-
       # @return [Boolean] Indicates whether VMs should be recreated
       attr_reader :recreate
 
@@ -103,7 +100,7 @@ module Bosh::Director
 
       def bind_models
         stemcell_manager = Api::StemcellManager.new
-        dns_manager = DnsManager.create
+        dns_manager = DnsManagerProvider.create
         assembler = DeploymentPlan::Assembler.new(
           self,
           stemcell_manager,
@@ -123,7 +120,7 @@ module Bosh::Director
         disk_manager = DiskManager.new(cloud, @logger)
         job_renderer = JobRenderer.create
         vm_creator = Bosh::Director::VmCreator.new(cloud, @logger, vm_deleter, disk_manager, job_renderer)
-        dns_manager = DnsManager.create
+        dns_manager = DnsManagerProvider.create
         instance_deleter = Bosh::Director::InstanceDeleter.new(ip_provider, dns_manager, disk_manager)
         compilation_instance_pool = CompilationInstancePool.new(InstanceReuser.new, vm_creator, self, @logger, instance_deleter)
         package_compile_step = DeploymentPlan::Steps::PackageCompileStep.new(
@@ -157,12 +154,6 @@ module Bosh::Director
         end
       end
 
-      # Returns a list of Vms in the deployment (according to DB)
-      # @return [Array<Models::Vm>]
-      def vm_models
-        @model.vms
-      end
-
       def skip_drain_for_job?(name)
         @skip_drain.nil? ? false : @skip_drain.for_job(name)
       end
@@ -197,12 +188,6 @@ module Bosh::Director
         @releases[name]
       end
 
-      # Adds a VM to deletion queue
-      # @param [Bosh::Director::Models::Vm] vm VM DB model
-      def mark_vm_for_deletion(vm)
-        @unneeded_vms << vm
-      end
-
       def instance_plans_with_missing_vms
         jobs_starting_on_deploy.collect_concat do |job|
           job.instance_plans_with_missing_vms

data/lib/bosh/director/deployment_plan/steps/package_compile_step.rb

@@ -67,7 +67,7 @@ module Bosh::Director
               task_result = nil
 
               prepare_vm(stemcell) do |instance|
-                vm_metadata_updater.update(instance.vm.model, :compiling => package.name)
+                vm_metadata_updater.update(instance.model, :compiling => package.name)
                 agent_task =
                   instance.agent_client.compile_package(
                     package.blobstore_id,

data/lib/bosh/director/deployment_plan/steps/update_step.rb

@@ -31,9 +31,6 @@ module Bosh::Director
         private
 
         def assemble
-          @logger.info('Deleting no longer needed VMs')
-          delete_unneeded_vms
-
           @logger.info('Deleting no longer needed instances')
           delete_unneeded_instances
 
@@ -53,23 +50,6 @@ module Bosh::Director
           )
         end
 
-        def delete_unneeded_vms
-          unneeded_vms = @deployment_plan.unneeded_vms
-          return @logger.info('No unneeded vms to delete') if unneeded_vms.empty?
-
-          @event_log.begin_stage('Deleting unneeded VMs', unneeded_vms.size)
-          ThreadPool.new(max_threads: Config.max_threads, logger: @logger).wrap do |pool|
-            unneeded_vms.each do |vm_model|
-              pool.process do
-                @event_log.track(vm_model.cid) do
-                  @logger.info("Delete unneeded VM #{vm_model.cid}")
-                  @vm_deleter.delete_vm(vm_model)
-                end
-              end
-            end
-          end
-        end
-
         def delete_unneeded_instances
           unneeded_instances = @deployment_plan.unneeded_instances
           if unneeded_instances.empty?
@@ -77,7 +57,7 @@ module Bosh::Director
             return
           end
           event_log_stage = @event_log.begin_stage('Deleting unneeded instances', unneeded_instances.size)
-          dns_manager = DnsManager.create
+          dns_manager = DnsManagerProvider.create
           instance_deleter = InstanceDeleter.new(@deployment_plan.ip_provider, dns_manager, @disk_manager)
           unneeded_instance_plans = unneeded_instances.map do |instance|
             DeploymentPlan::InstancePlan.new(

data/lib/bosh/director/disk_manager.rb

@@ -39,10 +39,10 @@ module Bosh::Director
       instance = instance_plan.instance
       disk_cid = instance.model.persistent_disk_cid
       return @logger.info('Skipping disk attaching') if disk_cid.nil?
-      vm_model = instance.vm.model
+      instance_model = instance.model
       begin
-        @cloud.attach_disk(vm_model.cid, disk_cid)
-        AgentClient.with_vm_credentials_and_agent_id(vm_model.credentials, vm_model.agent_id).mount_disk(disk_cid)
+        @cloud.attach_disk(instance_model.vm_cid, disk_cid)
+        AgentClient.with_vm_credentials_and_agent_id(instance_model.credentials, instance_model.agent_id).mount_disk(disk_cid)
       rescue => e
         @logger.warn("Failed to attach disk to new VM: #{e.inspect}")
         raise e
@@ -156,7 +156,7 @@ module Bosh::Director
 
       begin
         @logger.info("Detaching disk #{disk_cid}")
-        @cloud.detach_disk(instance.model.vm.cid, disk_cid)
+        @cloud.detach_disk(instance.model.vm_cid, disk_cid)
       rescue Bosh::Clouds::DiskNotAttached
         if disk.active
           raise CloudDiskNotAttached,
@@ -212,13 +212,13 @@ module Bosh::Director
     end
 
     def agent(instance)
-      AgentClient.with_vm_credentials_and_agent_id(instance.vm.model.credentials, instance.vm.model.agent_id)
+      AgentClient.with_vm_credentials_and_agent_id(instance.model.credentials, instance.model.agent_id)
     end
 
     def create_and_attach_disk(instance_plan, vm_recreator)
       instance = instance_plan.instance
       disk = create_disk(instance_plan)
-      @cloud.attach_disk(instance.model.vm.cid, disk.disk_cid)
+      @cloud.attach_disk(instance.model.vm_cid, disk.disk_cid)
       return disk
     rescue Bosh::Clouds::NoDiskSpace => e
       if e.ok_to_retry
@@ -227,7 +227,7 @@ module Bosh::Director
         unmount_disk_for(instance_plan)
         vm_recreator.recreate_vm(instance_plan, disk.disk_cid)
         begin
-          @cloud.attach_disk(instance.model.vm.cid, disk.disk_cid)
+          @cloud.attach_disk(instance.model.vm_cid, disk.disk_cid)
         rescue
           orphan_disk(disk)
           raise
@@ -255,7 +255,7 @@ module Bosh::Director
       disk_size = job.persistent_disk_type.disk_size
       cloud_properties = job.persistent_disk_type.cloud_properties
 
-      disk_cid = @cloud.create_disk(disk_size, cloud_properties, instance_model.vm.cid)
+      disk_cid = @cloud.create_disk(disk_size, cloud_properties, instance_model.vm_cid)
       Models::PersistentDisk.create(
         disk_cid: disk_cid,
         active: false,

data/lib/bosh/director/dns/dns_manager.rb

@@ -1,22 +1,76 @@
 module Bosh::Director
-  class DnsManager
-    attr_reader :dns_domain_name
-
+  class DnsManagerProvider
     def self.create
-      dns_config = Config.dns || {}
       dns_enabled = !!Config.dns_db # to be consistent with current behavior
-      logger = Config.logger
-      local_dns_repo = LocalDnsRepo.new(logger)
-      dns_domain_name = Canonicalizer.canonicalize(dns_config.fetch('domain_name', 'bosh'), :allow_dots => true)
-      dns_provider = PowerDns.new(dns_domain_name, logger)
+      if dns_enabled
+        dns_config = Config.dns || {}
+        logger = Config.logger
+        local_dns_repo = LocalDnsRepo.new(logger)
+        dns_domain_name = Canonicalizer.canonicalize(dns_config.fetch('domain_name', 'bosh'), :allow_dots => true)
+        dns_provider = PowerDns.new(dns_domain_name, logger)
+
+        EnabledDnsManager.new(dns_domain_name, dns_config, dns_provider, local_dns_repo, logger)
+      else
+        DisabledDnsManager.new
+      end
+    end
+  end
+
+  private
+
+  class DnsManager
+    def configure_nameserver ; end
+
+    def delete_dns_for_instance(instance_model) ; end
+
+    def dns_record_name(hostname, job_name, network_name, deployment_name) ; end
+
+    # build a list of dns servers to use
+    def dns_servers(network, dns_spec, add_default_dns = true)
+      servers = nil
+
+      if dns_spec
+        servers = []
+        dns_spec.each do |dns|
+          dns = NetAddr::CIDR.create(dns)
+          unless dns.size == 1
+            raise NetworkInvalidDns,
+              "Invalid DNS for network `#{network}': must be a single IP"
+          end
+
+          servers << dns.ip
+        end
+      end
 
-      new(dns_domain_name, dns_config, dns_enabled, dns_provider, local_dns_repo, logger)
+      return servers unless add_default_dns
+      add_default_dns_server(servers)
+    end
+
+    def find_dns_record(dns_record_name, ip_address) ; end
+
+    def find_dns_record_names_by_instance(instance_model) ; end
+
+    def flush_dns_cache ; end
+
+    def migrate_legacy_records(instance_model) ; end
+
+    def update_dns_record_for_instance(instance_model, dns_names_to_ip) ; end
+
+    private
+
+    def add_default_dns_server(servers)
+      servers
     end
+  end
 
-    def initialize(dns_domain_name, dns_config, dns_enabled, dns_provider, local_dns_repo, logger)
+  public
+
+  class EnabledDnsManager < DnsManager
+    attr_reader :dns_domain_name
+
+    def initialize(dns_domain_name, dns_config, dns_provider, local_dns_repo, logger)
       @dns_domain_name = dns_domain_name
       @dns_provider = dns_provider
-      @dns_enabled = dns_enabled
       @default_server = dns_config['server']
       @flush_command = dns_config['flush_command']
       @ip_address = dns_config['address']
@@ -25,12 +79,10 @@ module Bosh::Director
     end
 
     def dns_enabled?
-      @dns_enabled
+      true
     end
 
     def configure_nameserver
-      return unless dns_enabled?
-
       @dns_provider.create_or_update_nameserver(@ip_address)
     end
 
@@ -55,8 +107,6 @@ module Bosh::Director
     end
 
     def migrate_legacy_records(instance_model)
-      return unless dns_enabled?
-
       return if @local_dns_repo.find(instance_model).any?
 
       index_pattern_for_all_networks = dns_record_name(
@@ -81,8 +131,6 @@ module Bosh::Director
     end
 
     def delete_dns_for_instance(instance_model)
-      return unless dns_enabled?
-
       current_dns_records = @local_dns_repo.find(instance_model)
       if current_dns_records.empty?
         # for backwards compatibility when old instances
@@ -150,8 +198,6 @@ module Bosh::Director
 
     # add default dns server to an array of dns servers
     def add_default_dns_server(servers)
-      return servers unless dns_enabled?
-
       unless @default_server.to_s.empty? || @default_server == '127.0.0.1'
         (servers ||= []) << @default_server
         servers.uniq!
@@ -160,4 +206,14 @@ module Bosh::Director
       servers
     end
   end
+
+  class DisabledDnsManager < DnsManager
+    def dns_domain_name
+      nil
+    end
+
+    def dns_enabled?
+      false
+    end
+  end
 end

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

@@ -39,7 +39,7 @@ module Bosh::Director
 
       @logger.info('Deleting errand instances')
       event_log_stage = @event_log.begin_stage('Deleting errand instances', instance_plans.size, [@job.name])
-      dns_manager = DnsManager.create
+      dns_manager = DnsManagerProvider.create
       instance_deleter = InstanceDeleter.new(@deployment.ip_provider, dns_manager, @disk_manager)
       instance_deleter.delete_instance_plans(instance_plans, event_log_stage)
     end

data/lib/bosh/director/instance_deleter.rb

@@ -16,15 +16,13 @@ module Bosh::Director
     def delete_instance_plan(instance_plan, event_log_stage)
       instance_model = instance_plan.new? ? instance_plan.instance.model : instance_plan.existing_instance
 
-      @logger.info("Deleting instance '#{instance_model}'")
-
       event_log_stage.advance_and_track(instance_model.to_s) do
 
         error_ignorer.with_force_check do
           stop(instance_plan)
         end
 
-        vm_deleter.delete_for_instance_plan(instance_plan)
+        vm_deleter.delete_for_instance(instance_model)
 
         unless instance_model.compilation
           error_ignorer.with_force_check do

data/lib/bosh/director/instance_updater.rb

@@ -12,7 +12,7 @@ module Bosh::Director
       job_renderer = JobRenderer.create
       vm_creator = VmCreator.new(cloud, logger, vm_deleter, disk_manager, job_renderer)
       vm_recreator = VmRecreator.new(vm_creator, vm_deleter)
-      dns_manager = DnsManager.create
+      dns_manager = DnsManagerProvider.create
       new(
         cloud,
         logger,
@@ -63,7 +63,8 @@ module Bosh::Director
         @logger.info("Detaching instance #{instance}")
         unless instance_plan.currently_detached?
           @disk_manager.unmount_disk_for(instance_plan)
-          @vm_deleter.delete_for_instance_plan(instance_plan)
+          instance_model = instance_plan.new? ? instance_plan.instance.model : instance_plan.existing_instance
+          @vm_deleter.delete_for_instance(instance_model)
         end
         release_obsolete_ips(instance_plan)
         instance.update_state
@@ -169,7 +170,7 @@ module Bosh::Director
     end
 
     def agent(instance)
-      AgentClient.with_vm_credentials_and_agent_id(instance.model.vm.credentials, instance.model.vm.agent_id)
+      AgentClient.with_vm_credentials_and_agent_id(instance.model.credentials, instance.model.agent_id)
     end
   end
 end

data/lib/bosh/director/job_updater.rb

@@ -41,10 +41,18 @@ module Bosh::Director
       @logger.info("Found #{instance_plans.size} instances to update")
       event_log_stage = @event_log.begin_stage('Updating job', instance_plans.size, [ @job.name ])
 
+      ordered_azs = []
+      instance_plans.each do | instance_plan |
+        unless ordered_azs.include?(instance_plan.instance.availability_zone)
+          ordered_azs.push(instance_plan.instance.availability_zone)
+        end
+      end
+
       instance_plans_by_az = instance_plans.group_by{ |instance_plan| instance_plan.instance.availability_zone }
       canaries_done = false
 
-      instance_plans_by_az.each do |az, az_instance_plans|
+      ordered_azs.each do | az |
+        az_instance_plans = instance_plans_by_az[az]
         @logger.info("Starting to update az '#{az}'")
         ThreadPool.new(:max_threads => @job.update.max_in_flight).wrap do |pool|
           unless canaries_done
@@ -76,7 +84,7 @@ module Bosh::Director
       return if unneeded_instances.empty?
 
       event_log_stage = @event_log.begin_stage('Deleting unneeded instances', unneeded_instances.size, [@job.name])
-      dns_manager = DnsManager.create
+      dns_manager = DnsManagerProvider.create
       deleter = InstanceDeleter.new(@deployment_plan.ip_provider, dns_manager, @disk_manager)
       deleter.delete_instance_plans(unneeded_instance_plans, event_log_stage, max_threads: @job.update.max_in_flight)