bosh-director 1.3215.4.0 → 1.3232.0

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

@@ -23,7 +23,7 @@ module Bosh::Director
       def self.create_by_type(type, resource_id, data)
         handler_class = Base.handlers[type.to_s]
         if handler_class.nil?
-          raise "Cannot find handler for `#{type}' problem"
+          raise "Cannot find handler for '#{type}' problem"
         end
 
         handler_class.new(resource_id, data)
@@ -47,7 +47,7 @@ module Bosh::Director
       end
 
       # Talking to cloud should only be possible
-      # in the context of Resque job
+      # in the context of DJ job
       def cloud
         if @job.nil?
           handler_error("Cannot talk to cloud outside of job context")
@@ -78,7 +78,7 @@ module Bosh::Director
       def apply_resolution(resolution)
         action = self.class.action_for(resolution)
         if action.nil?
-          handler_error("Cannot find `#{resolution}' resolution for `#{self.class}'")
+          handler_error("Cannot find '#{resolution}' resolution for '#{self.class}'")
         end
         instance_eval(&action)
       end

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

@@ -14,16 +14,16 @@ module Bosh::Director
         @disk = Models::PersistentDisk[@disk_id]
 
         if @disk.nil?
-          handler_error("Disk `#{@disk_id}' is no longer in the database")
+          handler_error("Disk '#{@disk_id}' is no longer in the database")
         end
 
         if @disk.active
-          handler_error("Disk `#{@disk.disk_cid}' is no longer inactive")
+          handler_error("Disk '#{@disk.disk_cid}' is no longer inactive")
         end
 
         @instance = @disk.instance
         if @instance.nil?
-          handler_error("Cannot find instance for disk `#{@disk.disk_cid}'")
+          handler_error("Cannot find instance for disk '#{@disk.disk_cid}'")
         end
       end
 
@@ -31,7 +31,7 @@ module Bosh::Director
         job = @instance.job || "unknown job"
         uuid = @instance.uuid || "unknown id"
         index = @instance.index || "unknown index"
-        disk_label = "`#{@disk.disk_cid}' (#{@disk.size.to_i}M) for instance `#{job}/#{uuid} (#{index})'"
+        disk_label = "'#{@disk.disk_cid}' (#{@disk.size.to_i}M) for instance '#{job}/#{uuid} (#{index})'"
         "Disk #{disk_label} is inactive"
       end
 

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

@@ -12,19 +12,19 @@ module Bosh::Director
         @disk = Models::PersistentDisk[@disk_id]
 
         if @disk.nil?
-          handler_error("Disk `#{@disk_id}' is no longer in the database")
+          handler_error("Disk '#{@disk_id}' is no longer in the database")
         end
 
         @instance = @disk.instance
         if @instance.nil?
-          handler_error("Cannot find instance for disk `#{@disk.disk_cid}'")
+          handler_error("Cannot find instance for disk '#{@disk.disk_cid}'")
         end
       end
 
       def description
         job = @instance.job || "unknown job"
         uuid = @instance.uuid || "unknown id"
-        disk_label = "`#{@disk.disk_cid}' (#{job}/#{uuid}, #{@disk.size.to_i}M)"
+        disk_label = "'#{@disk.disk_cid}' (#{job}/#{uuid}, #{@disk.size.to_i}M)"
         "Disk #{disk_label} is missing"
       end
 

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

@@ -26,7 +26,7 @@ module Bosh::Director
       end
 
       def description
-        "VM with cloud ID `#{@instance.vm_cid}' missing."
+        "VM with cloud ID '#{@instance.vm_cid}' missing."
       end
     end
   end

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

@@ -12,12 +12,12 @@ module Bosh::Director
         @data = data
 
         if @disk.nil?
-          handler_error("Disk `#{disk_id}' is no longer in the database")
+          handler_error("Disk '#{disk_id}' is no longer in the database")
         end
 
         @disk_cid = @disk.disk_cid
         @vm_cid = @disk.instance.vm_cid if @disk.instance
-        handler_error("Can't find corresponding vm-cid for disk `#{@disk_cid}'") if @vm_cid.nil?
+        handler_error("Can't find corresponding vm-cid for disk '#{@disk_cid}'") if @vm_cid.nil?
 
         @instance = @disk.instance
 
@@ -51,7 +51,7 @@ module Bosh::Director
         plan { "Reattach disk and reboot instance" }
         action { reattach_disk(true) }
       end
-      
+
       def reattach_disk(reboot = false)
         cloud.attach_disk(@vm_cid, @disk_cid)
         if reboot

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

@@ -10,11 +10,11 @@ module Bosh::Director
         @instance = Models::Instance.find(id: instance_id)
 
         unless @instance.vm_cid
-          handler_error("VM `#{@instance.vm_cid}' is no longer in the database")
+          handler_error("VM '#{@instance.vm_cid}' is no longer in the database")
         end
 
         unless @instance.agent_id
-          handler_error("VM `#{@instance.agent_id}' doesn't have an agent id")
+          handler_error("VM '#{@instance.agent_id}' doesn't have an agent id")
         end
       end
 

data/lib/bosh/director/problem_resolver.rb

@@ -1,7 +1,7 @@
 module Bosh::Director
   class ProblemResolver
 
-    attr_reader :event_log, :logger
+    attr_reader :logger
 
     def initialize(deployment)
       @deployment = deployment
@@ -9,17 +9,17 @@ module Bosh::Director
       @resolution_error_logs = StringIO.new
 
       #temp
-      @event_log = Config.event_log
+      @event_log_stage = nil
       @logger = Config.logger
     end
 
     def begin_stage(stage_name, n_steps)
-      event_log.begin_stage(stage_name, n_steps)
+      @event_log_stage = Config.event_log.begin_stage(stage_name, n_steps)
       logger.info(stage_name)
     end
 
     def track_and_log(task, log = true)
-      event_log.track(task) do |ticker|
+      @event_log_stage.advance_and_track(task) do |ticker|
         logger.info(task) if log
         yield ticker if block_given?
       end
@@ -79,7 +79,7 @@ module Bosh::Director
     private
 
     def log_resolution_error(problem, error)
-      error_message = "Error resolving problem `#{problem.id}': #{error}"
+      error_message = "Error resolving problem '#{problem.id}': #{error}"
       logger.error(error_message)
       logger.error(error.backtrace.join("\n"))
       @resolution_error_logs.puts(error_message)

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

@@ -15,7 +15,7 @@ module Bosh::Director::ProblemScanner
 
         if similar_open_problems.size > 1
           raise Bosh::Director::CloudcheckTooManySimilarProblems,
-            "More than one problem of type `#{type}' " +
+            "More than one problem of type '#{type}' " +
               "exists for resource #{type} #{resource.id}"
         end
 

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

@@ -68,15 +68,16 @@ module Bosh::Director
       def initialize(event_log, logger)
         @event_log = event_log
         @logger = logger
+        @event_log_stage = nil
       end
 
       def begin_stage(stage_name, n_steps)
-        @event_log.begin_stage(stage_name, n_steps)
+        @event_log_stage = @event_log.begin_stage(stage_name, n_steps)
         @logger.info(stage_name)
       end
 
       def track_and_log(task, log = true)
-        @event_log.track(task) do |ticker|
+        @event_log_stage.advance_and_track(task) do |ticker|
           @logger.info(task) if log
           yield ticker if block_given?
         end

data/lib/bosh/director/scheduler.rb

@@ -38,7 +38,7 @@ module Bosh::Director
         begin
           director_job_class = Bosh::Director::Jobs.const_get(scheduled_job['command'].to_s)
         rescue NameError
-          raise "unknown job `Bosh::Director::Jobs::#{scheduled_job['command']}'"
+          raise "unknown job 'Bosh::Director::Jobs::#{scheduled_job['command']}'"
         end
 
         @scheduler.cron(scheduled_job['schedule']) do |_|
@@ -53,7 +53,7 @@ with params #{scheduled_job['params']}")
           end
 
           if should_enqueue
-            logger.info("enqueueing `#{scheduled_job['command']}'")
+            logger.info("enqueueing '#{scheduled_job['command']}'")
 
             schedule_message = "scheduled #{scheduled_job['command']}"
             if director_job_class.respond_to?(:schedule_message)
@@ -67,7 +67,7 @@ with params #{scheduled_job['params']}")
           end
         end
 
-        logger.info("added scheduled job `#{director_job_class}' with interval '#{scheduled_job['schedule']}'")
+        logger.info("added scheduled job '#{director_job_class}' with interval '#{scheduled_job['schedule']}'")
       end
     end
   end

data/lib/bosh/director/sequel.rb

@@ -1,12 +1,10 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 Sequel.extension :blank
 
 Sequel::Model.plugin :validation_helpers
 Sequel::Model.raise_on_typecast_failure = false
 
 [:exact_length, :format, :includes, :integer, :length_range, :max_length,
- :min_length, :not_string, :numeric, :type, :presence, :unique].each do |validation|
+ :min_length, :not_null, :numeric, :type, :presence, :unique].each do |validation|
   Sequel::Plugins::ValidationHelpers::DEFAULT_OPTIONS[validation][:message] = validation
 end
 

data/lib/bosh/director/stopper.rb

@@ -56,7 +56,7 @@ module Bosh::Director
       loop do
         wait_time = drain_time.abs
         if wait_time > 0
-          @logger.info("`#{@instance_model}' is draining: checking back in #{wait_time}s")
+          @logger.info("'#{@instance_model}' is draining: checking back in #{wait_time}s")
           sleep(wait_time)
         end
 

data/lib/bosh/director/validation_helper.rb

@@ -1,54 +1,77 @@
 module Bosh::Director
   module ValidationHelper
     def safe_property(hash, property, options = {})
-      result = nil
-
-      if hash && !hash.kind_of?(Hash)
-        raise Bosh::Director::ValidationInvalidType,
-              "Object (#{hash.inspect}) did not match the required type 'Hash'"
-
-      elsif hash && hash.has_key?(property)
-        result = hash[property]
-
-        if options[:class]
-          if options[:class] == :boolean
-            unless result.kind_of?(TrueClass) || result.kind_of?(FalseClass)
-              invalid_type(property, options[:class], result)
-            end
-
-          elsif !result.kind_of?(options[:class])
-            if options[:class] == String && result.kind_of?(Numeric)
-              result = result.to_s
-            else
-              invalid_type(property, options[:class], result)
-            end
-          end
-        end
 
-        if options[:min] && result < options[:min]
-          raise ValidationViolatedMin,
-                "'#{property}' value (#{result.inspect}) should be greater than #{options[:min].inspect}"
-        end
+      if options.has_key?(:default) && !options[:default].nil?
+        validate_property(property, options, options[:default], DefaultPropertyValidationMessage.new)
+      end
+
+      if !hash.nil? && !hash.kind_of?(Hash)
+        raise Bosh::Director::ValidationInvalidType, "Object (#{hash.inspect}) did not match the required type 'Hash'"
+      elsif !hash.nil? && hash.has_key?(property)
+        return validate_property(property, options, hash[property], PropertyValidationMessage.new)
+      elsif options.has_key?(:default)
+        return options[:default]
+      elsif !options[:optional]
+        raise ValidationMissingField, "Required property '#{property}' was not specified in object (#{hash.inspect})"
+      end
+    end
+
+    private
 
-        if options[:max] && result > options[:max]
-          raise ValidationViolatedMax,
-                "'#{property}' value (#{result.inspect}) should be less than #{options[:max].inspect}"
+    def validate_property(property, options, result, validation_message)
+      if options.has_key?(:class)
+        required_type = options[:class]
+        if required_type == :boolean
+          unless result.kind_of?(TrueClass) || result.kind_of?(FalseClass)
+            raise ValidationInvalidType, validation_message.invalid_type(property, required_type, result)
+          end
+        elsif !result.kind_of?(required_type)
+          if required_type == String && result.kind_of?(Numeric)
+            result = result.to_s
+          else
+            raise ValidationInvalidType, validation_message.invalid_type(property, required_type, result)
+          end
         end
+      end
 
-      elsif options[:default]
-        result = options[:default]
+      if options[:min] && result < options[:min]
+        raise ValidationViolatedMin, validation_message.invalid_min(options, property, result)
+      end
 
-      elsif !options[:optional]
-        raise ValidationMissingField,
-              "Required property '#{property}' was not specified in object (#{hash.inspect})"
+      if options[:max] && result > options[:max]
+        raise ValidationViolatedMax, validation_message.invalid_max(options, property, result)
       end
 
       result
     end
+  end
 
+  class PropertyValidationMessage
     def invalid_type(property, klass, value)
-      raise ValidationInvalidType,
-            "Property '#{property}' (value #{value.inspect}) did not match the required type '#{klass}'"
+      "Property '#{property}' value (#{value.inspect}) did not match the required type '#{klass}'"
+    end
+
+    def invalid_max(options, property, result)
+      "'#{property}' value (#{result.inspect}) should be less than #{options[:max].inspect}"
+    end
+
+    def invalid_min(options, property, result)
+      "'#{property}' value (#{result.inspect}) should be greater than #{options[:min].inspect}"
+    end
+  end
+
+  class DefaultPropertyValidationMessage
+    def invalid_type(property, klass, value)
+      "Default value for property '#{property}' value (#{value.inspect}) did not match the required type '#{klass}'"
+    end
+
+    def invalid_max(options, property, result)
+      "Default value for property '#{property}' value (#{result.inspect}) should be less than #{options[:max].inspect}"
+    end
+
+    def invalid_min(options, property, result)
+      "Default value for property '#{property}' value (#{result.inspect}) should be greater than #{options[:min].inspect}"
     end
   end
 end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3215.4.0'
+    VERSION = '1.3232.0'
   end
 end

data/lib/bosh/director/vm_creator.rb

@@ -7,26 +7,27 @@ module Bosh::Director
     include EncryptionHelper
     include PasswordHelper
 
-    def initialize(cloud, logger, vm_deleter, disk_manager, job_renderer)
+    def initialize(cloud, logger, vm_deleter, disk_manager, job_renderer, arp_flusher)
       @cloud = cloud
       @logger = logger
       @vm_deleter = vm_deleter
       @disk_manager = disk_manager
       @job_renderer = job_renderer
+      @arp_flusher = arp_flusher
     end
 
-    def create_for_instance_plans(instance_plans, ip_provider, event_log)
+    def create_for_instance_plans(instance_plans, ip_provider)
       return @logger.info('No missing vms to create') if instance_plans.empty?
 
       total = instance_plans.size
-      event_log.begin_stage('Creating missing vms', total)
+      event_log_stage = Config.event_log.begin_stage('Creating missing vms', total)
       ThreadPool.new(max_threads: Config.max_threads, logger: @logger).wrap do |pool|
         instance_plans.each do |instance_plan|
           instance = instance_plan.instance
 
           pool.process do
             with_thread_name("create_missing_vm(#{instance.model}/#{total})") do
-              event_log.track(instance.model.to_s) do
+              event_log_stage.advance_and_track(instance.model.to_s) do
                 @logger.info('Creating missing VM')
                 disks = [instance.model.persistent_disk_cid].compact
                 create_for_instance_plan(instance_plan, disks)
@@ -61,9 +62,17 @@ module Bosh::Director
 
       begin
         VmMetadataUpdater.build.update(instance_model, {})
-
         agent_client = AgentClient.with_vm_credentials_and_agent_id(instance_model.credentials, instance_model.agent_id)
         agent_client.wait_until_ready
+
+        if Config.flush_arp
+          ip_addresses = instance_plan.network_settings_hash.map do |index,network|
+            network['ip']
+          end.compact
+
+          @arp_flusher.delete_arp_entries(instance_model.vm_cid, ip_addresses)
+        end
+
         instance.update_trusted_certs
         instance.update_cloud_properties!
       rescue Exception => e
@@ -85,6 +94,22 @@ module Bosh::Director
 
     private
 
+    def add_event(deployment_name, instance_name, action, object_name = nil, parent_id = nil, error = nil)
+      event = Config.current_job.event_manager.create_event(
+          {
+              parent_id:   parent_id,
+              user:        Config.current_job.username,
+              action:      action,
+              object_type: 'vm',
+              object_name: object_name,
+              task:        Config.current_job.task_id,
+              deployment:  deployment_name,
+              instance:    instance_name,
+              error:       error
+          })
+      event.id
+    end
+
     def apply_initial_vm_state(instance_plan)
       instance_plan.instance.apply_initial_vm_state(instance_plan.spec)
 
@@ -96,9 +121,10 @@ module Bosh::Director
     end
 
     def create(instance_model, stemcell, cloud_properties, network_settings, disks, env)
+      parent_id = add_event(instance_model.deployment.name, instance_model.name, 'create')
       agent_id = self.class.generate_agent_id
       env = Bosh::Common::DeepCopy.copy(env)
-      options = { :agent_id => agent_id }
+      options = {:agent_id => agent_id}
 
       if Config.encryption?
         credentials = generate_agent_credentials
@@ -128,8 +154,14 @@ module Bosh::Director
       instance_model.update(options)
     rescue => e
       @logger.error("error creating vm: #{e.message}")
-      @vm_deleter.delete_vm(vm_cid) if vm_cid
+      if vm_cid
+        parent_id = add_event(instance_model.deployment.name, instance_model.name, 'delete', vm_cid)
+        @vm_deleter.delete_vm(vm_cid)
+        add_event(instance_model.deployment.name, instance_model.name, 'delete', vm_cid, parent_id)
+      end
       raise e
+    ensure
+      add_event(instance_model.deployment.name, instance_model.name, 'create', vm_cid, parent_id, e)
     end
 
     def self.generate_agent_id