bosh-director 1.3215.4.0 → 1.3232.0

data/lib/bosh/director/vm_deleter.rb

@@ -10,8 +10,17 @@ module Bosh::Director
 
     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)
+        begin
+          vm_cid = instance.vm_cid
+          instance_name = "#{instance.job}/#{instance.uuid}"
+          parent_id = add_event(instance.deployment.name, instance_name, vm_cid)
+          delete_vm(instance.vm_cid)
+          instance.update(vm_cid: nil, agent_id: nil, trusted_certs_sha1: nil, credentials: nil)
+        rescue Exception => e
+          raise e
+        ensure
+          add_event(instance.deployment.name, instance_name, vm_cid, parent_id, e)
+        end
       end
     end
 
@@ -19,5 +28,23 @@ module Bosh::Director
       @logger.info('Deleting VM')
       @error_ignorer.with_force_check { @cloud.delete_vm(vm_cid) }
     end
+
+    private
+
+    def add_event(deployment_name, instance_name, 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:      'delete',
+              object_type: 'vm',
+              object_name: object_name,
+              task:        Config.current_job.task_id,
+              deployment:  deployment_name,
+              instance:    instance_name,
+              error:       error
+          })
+      event.id
+    end
   end
 end

data/lib/bosh/director/vm_metadata_updater.rb

@@ -15,8 +15,12 @@ module Bosh::Director
         metadata = metadata.merge(@director_metadata)
         metadata[:deployment] = instance.deployment.name
 
+        metadata[:id] = instance.uuid
         metadata[:job] = instance.job
         metadata[:index] = instance.index.to_s
+        metadata[:name] = "#{instance.job}/#{instance.uuid}"
+
+        metadata[:created_at] = Time.new.getutc.strftime('%Y-%m-%dT%H:%M:%SZ')
 
         @cloud.set_vm_metadata(instance.vm_cid, metadata)
       end

data/lib/bosh/director/worker.rb

@@ -0,0 +1,52 @@
+module Bosh::Director
+  class Worker
+
+    def initialize(config, index=0)
+      @config = config
+      @index = index
+    end
+
+    def prep
+      Delayed::Worker.logger = @config.worker_logger
+
+      Bosh::Director::App.new(@config)
+
+      Delayed::Worker.backend = :sequel
+      Delayed::Worker.destroy_failed_jobs = true
+      Delayed::Worker.sleep_delay = ENV['INTERVAL'] || 1
+      Delayed::Worker.max_attempts = 0
+      Delayed::Worker.max_run_time = 31536000
+
+      @delayed_job_worker = nil
+      queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')
+
+      @delayed_job_worker = Delayed::Worker.new({:queues => queues})
+      trap('USR1') {
+        @delayed_job_worker.queues = [ 'non_existent_queue' ]
+      } #stop accepting new jobs when USR1 is sent
+    end
+
+    def start
+      @delayed_job_worker.name = "worker_#{@index}"
+      @delayed_job_worker.logger.info("Starting worker #{@delayed_job_worker.name}.")
+
+      begin
+        @delayed_job_worker_retries ||= 0
+        @delayed_job_worker.start
+      rescue Exception => e
+        @delayed_job_worker.logger.error("Something goes wrong during worker start. Attempt #{@delayed_job_worker_retries}. Error: #{e.inspect}")
+        while @delayed_job_worker_retries < 10
+          @delayed_job_worker_retries += 1
+          sleep 0.5
+          retry
+        end
+        @delayed_job_worker.logger.error("Max retries reached. Error: #{e.inspect}")
+        raise e
+      end
+    end
+
+    def queues
+      @delayed_job_worker.queues
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3215.4.0
+  version: 1.3232.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-25 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.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -304,48 +304,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: redis
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.25.0
-- !ruby/object:Gem::Dependency
-  name: resque-backtrace
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -366,14 +324,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 4.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 4.32.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -472,6 +430,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.2.1
+- !ruby/object:Gem::Dependency
+  name: talentbox-delayed_job_sequel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: unix-crypt
   requirement: !ruby/object:Gem::Requirement
@@ -677,10 +649,16 @@ files:
 - db/migrations/director/20160121003800_drop_vms_fkeys.rb
 - db/migrations/director/20160202162216_add_post_start_completed_to_instance.rb
 - db/migrations/director/20160210201838_denormalize_compiled_package_stemcell_id_to_stemcell_name_and_version.rb
+- db/migrations/director/20160211174110_add_events.rb
 - db/migrations/director/20160211193904_add_scopes_to_deployment.rb
 - db/migrations/director/20160219175840_add_column_teams_to_deployments.rb
 - db/migrations/director/20160224222508_add_deployment_name_to_task.rb
 - db/migrations/director/20160225182206_rename_post_start_completed.rb
+- db/migrations/director/20160324181932_create_delayed_jobs.rb
+- db/migrations/director/20160324182211_add_locks.rb
+- db/migrations/director/20160329201256_set_instances_with_nil_serial_to_false.rb
+- db/migrations/director/20160331225404_backfill_stemcell_os.rb
+- db/migrations/director/20160411104407_add_task_started_at.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -695,6 +673,7 @@ files:
 - lib/bosh/director/api/controllers/cloud_configs_controller.rb
 - lib/bosh/director/api/controllers/deployments_controller.rb
 - lib/bosh/director/api/controllers/disks_controller.rb
+- lib/bosh/director/api/controllers/events_controller.rb
 - lib/bosh/director/api/controllers/info_controller.rb
 - lib/bosh/director/api/controllers/locks_controller.rb
 - lib/bosh/director/api/controllers/packages_controller.rb
@@ -710,7 +689,9 @@ files:
 - lib/bosh/director/api/deployment_lookup.rb
 - lib/bosh/director/api/deployment_manager.rb
 - lib/bosh/director/api/director_uuid_provider.rb
+- lib/bosh/director/api/event_manager.rb
 - lib/bosh/director/api/extensions/scoping.rb
+- lib/bosh/director/api/extensions/syslog_request_logger.rb
 - lib/bosh/director/api/http_constants.rb
 - lib/bosh/director/api/instance_lookup.rb
 - lib/bosh/director/api/instance_manager.rb
@@ -733,6 +714,7 @@ files:
 - lib/bosh/director/api/user/database_user_manager.rb
 - lib/bosh/director/api/user/user_manager_provider.rb
 - lib/bosh/director/app.rb
+- lib/bosh/director/arp_flusher.rb
 - lib/bosh/director/blob_util.rb
 - lib/bosh/director/blobstores.rb
 - lib/bosh/director/cloudcheck_helper.rb
@@ -868,6 +850,7 @@ files:
 - lib/bosh/director/jobs/cloud_check/scan.rb
 - lib/bosh/director/jobs/cloud_check/scan_and_fix.rb
 - lib/bosh/director/jobs/create_snapshot.rb
+- lib/bosh/director/jobs/db_job.rb
 - lib/bosh/director/jobs/delete_deployment.rb
 - lib/bosh/director/jobs/delete_deployment_snapshots.rb
 - lib/bosh/director/jobs/delete_orphan_disks.rb
@@ -890,6 +873,7 @@ files:
 - lib/bosh/director/jobs/release/release_job.rb
 - lib/bosh/director/jobs/run_errand.rb
 - lib/bosh/director/jobs/scheduled_backup.rb
+- lib/bosh/director/jobs/scheduled_events_cleanup.rb
 - lib/bosh/director/jobs/scheduled_orphan_cleanup.rb
 - lib/bosh/director/jobs/snapshot_deployment.rb
 - lib/bosh/director/jobs/snapshot_deployments.rb
@@ -907,7 +891,6 @@ files:
 - lib/bosh/director/manifest/changeset.rb
 - lib/bosh/director/manifest/diff_lines.rb
 - lib/bosh/director/manifest/manifest.rb
-- lib/bosh/director/manifest/redactor.rb
 - lib/bosh/director/models.rb
 - lib/bosh/director/models/cloud_config.rb
 - lib/bosh/director/models/compiled_package.rb
@@ -918,9 +901,11 @@ files:
 - lib/bosh/director/models/dns.rb
 - lib/bosh/director/models/dns/domain.rb
 - lib/bosh/director/models/dns/record.rb
+- lib/bosh/director/models/event.rb
 - lib/bosh/director/models/helpers/model_helper.rb
 - lib/bosh/director/models/instance.rb
 - lib/bosh/director/models/ip_address.rb
+- lib/bosh/director/models/lock.rb
 - lib/bosh/director/models/log_bundle.rb
 - lib/bosh/director/models/orphan_disk.rb
 - lib/bosh/director/models/orphan_snapshot.rb
@@ -968,6 +953,7 @@ files:
 - lib/bosh/director/vm_deleter.rb
 - lib/bosh/director/vm_metadata_updater.rb
 - lib/bosh/director/vm_recreator.rb
+- lib/bosh/director/worker.rb
 - lib/cloud/dummy.rb
 homepage: https://github.com/cloudfoundry/bosh
 licenses:

data/lib/bosh/director/manifest/redactor.rb

@@ -1,44 +0,0 @@
-module Bosh::Director
-  class Redactor
-    REDACT_KEY_NAMES = %w(
-      properties
-      bosh
-    )
-
-    def self.redact_properties(obj, redact = true ,redact_key_is_ancestor = false)
-      return obj unless redact
-      if redact_key_is_ancestor
-        if obj.respond_to?(:key?)
-          obj.keys.each{ |key|
-            if obj[key].respond_to?(:each)
-              redact_properties(obj[key], redact, true)
-            else
-              obj[key] = '<redacted>'
-            end
-          }
-        elsif obj.respond_to?(:each_index)
-          obj.each_index { |i|
-            if obj[i].respond_to?(:each)
-              redact_properties(obj[i], redact, true)
-            else
-              obj[i] = '<redacted>'
-            end
-          }
-        end
-      else
-        if obj.respond_to?(:each)
-          obj.each{ |a|
-            if obj.respond_to?(:key?) && REDACT_KEY_NAMES.any? { |key| key == a.first } && a.last.respond_to?(:key?)
-              redact_properties(a.last, redact, true)
-            else
-              redact_properties(a.respond_to?(:last) ? a.last : a, redact)
-            end
-
-          }
-        end
-      end
-
-      obj
-    end
-  end
-end