bosh-director 1.2807.0 → 1.2809.0

data/bin/bosh-director-worker

@@ -54,9 +54,9 @@ Bosh::Director::App.new(config)
 logger = Logging::Logger.new('DirectorWorker')
 resque_logging = config.hash.fetch('resque', {}).fetch('logging', {})
 if resque_logging.has_key?('file')
-  logger.add_appenders(Logging.appenders.file('DirectorWorkerFile', filename: resque_logging.fetch('file')))
+  logger.add_appenders(Logging.appenders.file('DirectorWorkerFile', filename: resque_logging.fetch('file'), layout: ThreadFormatter.layout))
 else
-  logger.add_appenders(Logging.appenders.stdout('DirectorWorkerIO'))
+  logger.add_appenders(Logging.appenders.stdout('DirectorWorkerIO', layout: ThreadFormatter.layout))
 end
 logger.level = Logging.levelify(resque_logging.fetch('level', 'info'))
 Resque.logger = logger

data/db/migrations/director/20150102234124_denormalize_task_user_id_to_task_username.rb

@@ -0,0 +1,38 @@
+Sequel.migration do
+  up do
+    # mysql doesn't let us drop tasks' user_id column because it has a foreign key,
+    # and sequel won't let us drop the foreign key, so we're recreating the table
+    # from scratch. Sorry.
+
+    create_table :tasks_new do
+      primary_key :id
+      String :state, :null => false
+      Time :timestamp, :null => false
+      String :description, :null => false
+      String :result, :text => true, :null => true
+      String :output, :null => true
+      Time :checkpoint_time
+      String :type, :null => false
+      String :username, :null => true
+    end
+
+    run "INSERT INTO tasks_new
+           (state, timestamp, description, result, output, checkpoint_time, type, username)
+         SELECT t.state, t.timestamp, t.description, t.result, t.output, t.checkpoint_time, t.type, u.username
+           FROM tasks t
+             LEFT OUTER JOIN users u ON t.user_id = u.id"
+
+    drop_table :tasks
+    rename_table :tasks_new, :tasks
+
+    alter_table :tasks do
+      add_index :state
+      add_index :timestamp
+      add_index :description
+    end
+  end
+
+  down do
+    raise Sequel::Error, "Irreversible migration, tasks:user_id might contain nulls so we cannot enforce 'not null' constraint"
+  end
+end

data/lib/bosh/director/api/compiled_package_group_manager.rb

@@ -5,12 +5,12 @@ module Bosh::Director
     class CompiledPackageGroupManager
       include ApiHelper
 
-      def create_from_file_path(user, path)
+      def create_from_file_path(username, path)
         unless File.exists?(path)
           raise DirectorError, "Failed to import compiled packages: file not found - #{path}"
         end
 
-        JobQueue.new.enqueue(user, Jobs::ImportCompiledPackages, 'import compiled packages', [path])
+        JobQueue.new.enqueue(username, Jobs::ImportCompiledPackages, 'import compiled packages', [path])
       end
     end
   end

data/lib/bosh/director/api/deployment_manager.rb

@@ -11,7 +11,7 @@ module Bosh::Director
         DeploymentLookup.new.by_name(name)
       end
 
-      def create_deployment(user, deployment_manifest, options = {})
+      def create_deployment(username, deployment_manifest, options = {})
         random_name = "deployment-#{SecureRandom.uuid}"
         deployment_manifest_dir = Dir::tmpdir
         deployment_manifest_file = File.join(deployment_manifest_dir, random_name)
@@ -22,11 +22,11 @@ module Bosh::Director
 
         write_file(deployment_manifest_file, deployment_manifest)
 
-        JobQueue.new.enqueue(user, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file, options])
+        JobQueue.new.enqueue(username, Jobs::UpdateDeployment, 'create deployment', [deployment_manifest_file, options])
       end
 
-      def delete_deployment(user, deployment, options = {})
-        JobQueue.new.enqueue(user, Jobs::DeleteDeployment, "delete deployment #{deployment.name}", [deployment.name, options])
+      def delete_deployment(username, deployment, options = {})
+        JobQueue.new.enqueue(username, Jobs::DeleteDeployment, "delete deployment #{deployment.name}", [deployment.name, options])
       end
 
       def deployment_to_json(deployment)

data/lib/bosh/director/api/instance_manager.rb

@@ -39,7 +39,7 @@ module Bosh::Director
         AgentClient.with_defaults(vm.agent_id)
       end
 
-      def fetch_logs(user, deployment_name, job, index, options = {})
+      def fetch_logs(username, deployment_name, job, index, options = {})
         if deployment_name.nil? || job.nil? || index.nil?
           raise DirectorError,
                 'deployment, job and index parameters are required'
@@ -47,14 +47,14 @@ module Bosh::Director
 
         instance = find_by_name(deployment_name, job, index)
 
-        JobQueue.new.enqueue(user, Jobs::FetchLogs, 'fetch logs', [instance.id, options])
+        JobQueue.new.enqueue(username, Jobs::FetchLogs, 'fetch logs', [instance.id, options])
       end
 
-      def ssh(user, options)
+      def ssh(username, options)
         description = "ssh: #{options['command']}:#{options['target']}"
         deployment = DeploymentLookup.new.by_name(options['deployment_name'])
 
-        JobQueue.new.enqueue(user, Jobs::Ssh, description, [deployment.id, options])
+        JobQueue.new.enqueue(username, Jobs::Ssh, description, [deployment.id, options])
       end
     end
   end

data/lib/bosh/director/api/problem_manager.rb

@@ -6,10 +6,10 @@ module Bosh::Director
         @deployment_manager = deployment_manager
       end
 
-      def perform_scan(user, deployment_name)
+      def perform_scan(username, deployment_name)
         deployment = @deployment_manager.find_by_name(deployment_name)
 
-        JobQueue.new.enqueue(user, Jobs::CloudCheck::Scan, 'scan cloud', [deployment.name])
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::Scan, 'scan cloud', [deployment.name])
       end
 
       def get_problems(deployment_name)
@@ -23,15 +23,15 @@ module Bosh::Director
         Models::DeploymentProblem.filter(filters).order(:created_at).all
       end
 
-      def apply_resolutions(user, deployment_name, resolutions)
+      def apply_resolutions(username, deployment_name, resolutions)
         deployment = @deployment_manager.find_by_name(deployment_name)
-        JobQueue.new.enqueue(user, Jobs::CloudCheck::ApplyResolutions, 'apply resolutions', [deployment.name, resolutions])
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::ApplyResolutions, 'apply resolutions', [deployment.name, resolutions])
       end
 
-      def scan_and_fix(user, deployment_name, jobs)
+      def scan_and_fix(username, deployment_name, jobs)
         deployment = @deployment_manager.find_by_name(deployment_name)
 
-        JobQueue.new.enqueue(user, Jobs::CloudCheck::ScanAndFix, 'scan and fix', [deployment.name, jobs, Bosh::Director::Config.fix_stateful_nodes])
+        JobQueue.new.enqueue(username, Jobs::CloudCheck::ScanAndFix, 'scan and fix', [deployment.name, jobs, Bosh::Director::Config.fix_stateful_nodes])
       end
     end
   end

data/lib/bosh/director/api/release_manager.rb

@@ -46,21 +46,21 @@ module Bosh::Director
         release_version
       end
 
-      def create_release_from_url(user, release_url, options)
+      def create_release_from_url(username, release_url, options)
         options[:remote] = true
-        JobQueue.new.enqueue(user, Jobs::UpdateRelease, 'create release', [release_url, options])
+        JobQueue.new.enqueue(username, Jobs::UpdateRelease, 'create release', [release_url, options])
       end
 
-      def create_release_from_file_path(user, release_path, options)
+      def create_release_from_file_path(username, release_path, options)
         unless File.exists?(release_path)
           raise DirectorError, "Failed to create release: file not found - #{release_path}"
         end
 
-        JobQueue.new.enqueue(user, Jobs::UpdateRelease, 'create release', [release_path, options])
+        JobQueue.new.enqueue(username, Jobs::UpdateRelease, 'create release', [release_path, options])
       end
 
-      def delete_release(user, release, options = {})
-        JobQueue.new.enqueue(user, Jobs::DeleteRelease, "delete release: #{release.name}", [release.name, options])
+      def delete_release(username, release, options = {})
+        JobQueue.new.enqueue(username, Jobs::DeleteRelease, "delete release: #{release.name}", [release.name, options])
       end
     end
   end

data/lib/bosh/director/api/snapshot_manager.rb

@@ -1,20 +1,20 @@
 module Bosh::Director
   module Api
     class SnapshotManager
-      def create_deployment_snapshot_task(user, deployment, options = {})
-        JobQueue.new.enqueue(user, Jobs::SnapshotDeployment, 'snapshot deployment', [deployment.name, options])
+      def create_deployment_snapshot_task(username, deployment, options = {})
+        JobQueue.new.enqueue(username, Jobs::SnapshotDeployment, 'snapshot deployment', [deployment.name, options])
       end
 
-      def create_snapshot_task(user, instance, options)
-        JobQueue.new.enqueue(user, Jobs::CreateSnapshot, 'create snapshot', [instance.id, options])
+      def create_snapshot_task(username, instance, options)
+        JobQueue.new.enqueue(username, Jobs::CreateSnapshot, 'create snapshot', [instance.id, options])
       end
 
-      def delete_deployment_snapshots_task(user, deployment)
-        JobQueue.new.enqueue(user, Jobs::DeleteDeploymentSnapshots, 'delete deployment snapshots', [deployment.name])
+      def delete_deployment_snapshots_task(username, deployment)
+        JobQueue.new.enqueue(username, Jobs::DeleteDeploymentSnapshots, 'delete deployment snapshots', [deployment.name])
       end
 
-      def delete_snapshots_task(user, snapshot_cids)
-        JobQueue.new.enqueue(user, Jobs::DeleteSnapshots, 'delete snapshot', [snapshot_cids])
+      def delete_snapshots_task(username, snapshot_cids)
+        JobQueue.new.enqueue(username, Jobs::DeleteSnapshots, 'delete snapshot', [snapshot_cids])
       end
 
       def find_by_cid(deployment, snapshot_cid)

data/lib/bosh/director/api/stemcell_manager.rb

@@ -21,22 +21,22 @@ module Bosh::Director
         false
       end
 
-      def create_stemcell_from_url(user, stemcell_url)
-        JobQueue.new.enqueue(user, Jobs::UpdateStemcell, 'create stemcell', [stemcell_url, { remote: true }])
+      def create_stemcell_from_url(username, stemcell_url)
+        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_url, { remote: true }])
       end
 
-      def create_stemcell_from_file_path(user, stemcell_path)
+      def create_stemcell_from_file_path(username, stemcell_path)
         unless File.exists?(stemcell_path)
           raise DirectorError, "Failed to create stemcell: file not found - #{stemcell_path}"
         end
 
-        JobQueue.new.enqueue(user, Jobs::UpdateStemcell, 'create stemcell', [stemcell_path])
+        JobQueue.new.enqueue(username, Jobs::UpdateStemcell, 'create stemcell', [stemcell_path])
       end
 
-      def delete_stemcell(user, stemcell, options={})
+      def delete_stemcell(username, stemcell, options={})
         description = "delete stemcell: #{stemcell.name}/#{stemcell.version}"
 
-        JobQueue.new.enqueue(user, Jobs::DeleteStemcell, description, [stemcell.name, stemcell.version, options])
+        JobQueue.new.enqueue(username, Jobs::DeleteStemcell, description, [stemcell.name, stemcell.version, options])
       end
     end
   end

data/lib/bosh/director/api/task_helper.rb

@@ -4,8 +4,7 @@ module Bosh::Director
   module Api
     class TaskHelper
       def create_task(username, type, description)
-        user = Models::User[:username => username]
-        task = Models::Task.create(:user => user,
+        task = Models::Task.create(:username => username,
                                    :type => type,
                                    :description => description,
                                    :state => :queued,

data/lib/bosh/director/api/task_manager.rb

@@ -25,7 +25,7 @@ module Bosh::Director
           "description" => task.description,
           "timestamp" => task.timestamp.to_i,
           "result" => task.result,
-          "user" => task.user ? task.user.username : "admin"
+          "user" => task.username || "admin"
         }
       end
 
@@ -61,4 +61,4 @@ module Bosh::Director
       end
     end
   end
-end
+end

data/lib/bosh/director/api/vm_state_manager.rb

@@ -1,8 +1,8 @@
 module Bosh::Director
   module Api
     class VmStateManager
-      def fetch_vm_state(user, deployment, format)
-        JobQueue.new.enqueue(user, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format])
+      def fetch_vm_state(username, deployment, format)
+        JobQueue.new.enqueue(username, Jobs::VmState, 'retrieve vm-stats', [deployment.id, format])
       end
     end
   end

data/lib/bosh/director/config.rb

@@ -1,5 +1,6 @@
 require 'fileutils'
 require 'logging'
+require 'bosh/director/dns_helper'
 
 module Bosh::Director
 

data/lib/bosh/director/job_queue.rb

@@ -5,8 +5,8 @@ module Bosh::Director
   # Abstracts the resque system.
 
   class JobQueue
-    def enqueue(user, job_class, description, params)
-      task = Api::TaskHelper.new.create_task(user, job_class.job_type, description)
+    def enqueue(username, job_class, description, params)
+      task = Api::TaskHelper.new.create_task(username, job_class.job_type, description)
 
       Resque.enqueue(job_class, task.id, *params)
 

data/lib/bosh/director/models/task.rb

@@ -2,7 +2,6 @@
 
 module Bosh::Director::Models
   class Task < Sequel::Model(Bosh::Director::Config.db)
-    many_to_one  :user
     def validate
       validates_presence [:state, :timestamp, :description]
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2807.0'
+    VERSION = '1.2809.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2807.0
+  version: 1.2809.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-25 00:00:00.000000000 Z
+date: 2015-01-06 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.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.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.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.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.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.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.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2807.0
+        version: 1.2809.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -525,7 +525,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  0b041c'
+  f3cadb'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -569,6 +569,7 @@ files:
 - db/migrations/director/20140124225348_proper_pk_for_attributes.rb
 - db/migrations/director/20140731215410_increase_text_limit_for_data_columns.rb
 - db/migrations/director/20141204234517_add_cloud_properties_to_persistent_disk.rb
+- db/migrations/director/20150102234124_denormalize_task_user_id_to_task_username.rb
 - db/migrations/dns/20120123234908_initial.rb
 - lib/bosh/director.rb
 - lib/bosh/director/agent_client.rb
@@ -793,7 +794,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3015350443129074724
+      hash: 182295446250487425
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23