bosh-director 1.5.0.pre.1633 → 1.5.0.pre.1639

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

@@ -1,14 +1,14 @@
 module Bosh::Director
   module Api
     class BackupManager
-      attr_accessor :destination_path
+      attr_reader :destination_path
 
       def initialize
         @destination_path = '/var/vcap/store/director/backup.tgz'
       end
 
-      def create_backup(user)
-        JobQueue.new.enqueue(user, Jobs::Backup, 'bosh backup', [destination_path])
+      def create_backup(username)
+        JobQueue.new.enqueue(username, Jobs::Backup, 'bosh backup', [destination_path])
       end
     end
   end

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Api
     class DeploymentManager
@@ -18,7 +16,7 @@ module Bosh::Director
         deployment_manifest_dir = Dir::tmpdir
         deployment_manifest_file = File.join(deployment_manifest_dir, random_name)
         unless check_available_disk_space(deployment_manifest_dir, deployment_manifest.size)
-          raise NotEnoughDiskSpace, "Uploading deployment manifest failed. " +
+          raise NotEnoughDiskSpace, 'Uploading deployment manifest failed. ' +
             "Insufficient space on BOSH director in #{deployment_manifest_dir}"
         end
 
@@ -33,7 +31,7 @@ module Bosh::Director
 
       def deployment_to_json(deployment)
         result = {
-          "manifest" => deployment.manifest,
+          'manifest' => deployment.manifest,
         }
 
         Yajl::Encoder.encode(result)
@@ -46,10 +44,10 @@ module Bosh::Director
           instance = vm.instance
 
           vms << {
-            "agent_id" => vm.agent_id,
-            "cid" => vm.cid,
-            "job" => instance ? instance.job : nil,
-            "index" => instance ? instance.index : nil
+            'agent_id' => vm.agent_id,
+            'cid' => vm.cid,
+            'job' => instance ? instance.job : nil,
+            'index' => instance ? instance.index : nil
           }
         end
 

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Api
     class InstanceManager
@@ -44,7 +42,7 @@ module Bosh::Director
       def fetch_logs(user, deployment_name, job, index, options = {})
         if deployment_name.nil? || job.nil? || index.nil?
           raise DirectorError,
-                "deployment, job and index parameters are required"
+                'deployment, job and index parameters are required'
         end
 
         instance = find_by_name(deployment_name, job, index)

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Api
     class ProblemManager

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

@@ -1,11 +1,9 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Api
     class ReleaseManager
       include ApiHelper
 
-      RELEASE_TGZ = "release.tgz"
+      RELEASE_TGZ = 'release.tgz'
 
       # Finds release by name
       # @param [String] name Release name
@@ -35,16 +33,16 @@ module Bosh::Director
       end
 
       def create_release(user, release_bundle, options = {})
-        release_dir = Dir.mktmpdir("release")
+        release_dir = Dir.mktmpdir('release')
 
         if options['remote']
           options['location'] = release_bundle
         else
           unless check_available_disk_space(release_dir, release_bundle.size)
-            raise NotEnoughDiskSpace, "Uploading release archive failed. " +
+            raise NotEnoughDiskSpace, 'Uploading release archive failed. ' +
               "Insufficient space on BOSH director in #{release_dir}"
           end
-  
+
           write_file(File.join(release_dir, RELEASE_TGZ), release_bundle)
         end
 
@@ -56,4 +54,4 @@ module Bosh::Director
       end
     end
   end
-end
+end

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

@@ -1,10 +1,11 @@
 # Copyright (c) 2009-2012 VMware, Inc.
+require 'bosh/director/api/task_remover'
 
 module Bosh::Director
   module Api
-    module TaskHelper
-      def create_task(user, type, description)
-        user = Models::User[:username => user]
+    class TaskHelper
+      def create_task(username, type, description)
+        user = Models::User[:username => username]
         task = Models::Task.create(:user => user,
                                    :type => type,
                                    :description => description,
@@ -15,27 +16,12 @@ module Bosh::Director
         task_status_file = File.join(log_dir, "debug")
         FileUtils.mkdir_p(log_dir)
         logger = Logger.new(task_status_file)
-        logger.level= Config.logger.level
+        logger.level = Config.logger.level
         logger.info("Director Version : #{Bosh::Director::VERSION}")
         logger.info("Enqueuing task: #{task.id}")
 
         # remove old tasks
-        min_task_id = task.id - Config.max_tasks
-        task_files = Dir.glob(File.join(Config.base_dir, "tasks/*"))
-        task_files.each do |file_path|
-          begin
-            task_file = File.basename(file_path)
-            task_id = Integer(task_file)
-
-            if task_id <= min_task_id && task_id >= 0
-              logger.info("Delete #{task_file}")
-              FileUtils.rm_rf file_path
-              Models::Task[task_id].destroy
-            end
-          rescue
-            # skip over invalid task files
-          end
-        end
+        TaskRemover.new(Config.max_tasks, logger).remove
 
         task.output = log_dir
         task.save

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

@@ -0,0 +1,21 @@
+module Bosh::Director::Api
+  class TaskRemover
+    def initialize(max_tasks, logger)
+      @max_tasks = max_tasks
+      #@logger = logger
+    end
+
+    def remove
+      removal_candidates_dataset.each do |task|
+        FileUtils.rm_rf(task.output)
+        task.destroy
+      end
+    end
+
+    private
+    def removal_candidates_dataset
+      Bosh::Director::Models::Task.filter("state NOT IN ('processing', 'queued')").
+        order{id.desc}.limit(2, @max_tasks)
+    end
+  end
+end

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

@@ -1,5 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module Api
     class VmStateManager

data/lib/bosh/director/job_queue.rb

@@ -1,12 +1,12 @@
+require 'bosh/director/api/task_helper'
+
 module Bosh::Director
 
   # Abstracts the resque system.
 
   class JobQueue
-    include Api::TaskHelper
-
     def enqueue(user, job_class, description, params)
-      task = create_task(user, job_class.job_type, description)
+      task = Api::TaskHelper.new.create_task(user, job_class.job_type, description)
 
       Resque.enqueue(job_class, task.id, *params)
 

data/lib/bosh/director/version.rb

@@ -2,6 +2,6 @@
 
 module Bosh
   module Director
-    VERSION = '1.5.0.pre.1633'
+    VERSION = '1.5.0.pre.1639'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1633
+  version: 1.5.0.pre.1639
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-24 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.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1633
+        version: 1.5.0.pre.1639
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  72d86c'
+  831cf9'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -536,6 +536,7 @@ files:
 - lib/bosh/director/api/stemcell_manager.rb
 - lib/bosh/director/api/task_helper.rb
 - lib/bosh/director/api/task_manager.rb
+- lib/bosh/director/api/task_remover.rb
 - lib/bosh/director/api/user_manager.rb
 - lib/bosh/director/api/vm_state_manager.rb
 - lib/bosh/director/app.rb