bosh-director 1.5.0.pre.1134 → 1.5.0.pre.1138

data/lib/bosh/director/compile_task.rb

@@ -139,6 +139,40 @@ module Bosh::Director
       spec
     end
 
+    # @param [CompileTask] task
+    # @return [Models::CompiledPackage]
+    def find_compiled_package(logger, event_log)
+      # Check if this package is already compiled
+      compiled_package = Models::CompiledPackage[
+        :package_id => package.id,
+        :stemcell_id => stemcell.id,
+        :dependency_key => dependency_key
+      ]
+      if compiled_package
+        logger.info("Found compiled version of package `#{package.desc}' " +
+                       "for stemcell `#{stemcell.desc}'")
+      else
+        if Config.use_compiled_package_cache?
+          if BlobUtil.exists_in_global_cache?(package, cache_key)
+            event_log.track("Downloading '#{package.desc}' from global cache") do
+              # has side effect of putting CompiledPackage model in db
+              compiled_package = BlobUtil.fetch_from_global_cache(package, stemcell, cache_key, dependency_key)
+            end
+          end
+        end
+
+        if compiled_package
+          logger.info("Package `Found compiled version of package `#{package.desc}'" +
+                         "for stemcell `#{stemcell.desc}' in global cache")
+        else
+          logger.info("Package `#{package.desc}' " +
+                         "needs to be compiled on `#{stemcell.desc}'")
+        end
+      end
+
+      compiled_package
+    end
+
     private
     def generate_dependency_key(packages)
       key = packages.sort { |a, b|

data/lib/bosh/director/package_compiler.rb

@@ -114,7 +114,7 @@ module Bosh::Director
 
       task = CompileTask.new(package, stemcell, dependencies, job)
 
-      compiled_package = find_compiled_package(task)
+      compiled_package = task.find_compiled_package(@logger, @event_log)
       if compiled_package
         task.use_compiled_package(compiled_package)
       end
@@ -153,69 +153,13 @@ module Bosh::Director
       end
     end
 
-    def compile_packages
-      @event_log.begin_stage("Compiling packages", compilation_count)
-      number_of_workers = @deployment_plan.compilation.workers
-
-      begin
-        ThreadPool.new(:max_threads => number_of_workers).wrap do |pool|
-          loop do
-            # process as many tasks without waiting
-            loop do
-              break if director_job_cancelled?
-              task = @tasks_mutex.synchronize { @ready_tasks.pop }
-              break if task.nil?
-
-              pool.process { process_task(task) }
-            end
-
-            break if !pool.working? && (director_job_cancelled? || @ready_tasks.empty?)
-            sleep(0.1)
-          end
-        end
-      ensure
-        # Delete all of the VMs if we were reusing compilation VMs. This can't
-        # happen until everything was done compiling.
-        if @deployment_plan.compilation.reuse_compilation_vms
-          # Using a new ThreadPool instead of reusing the previous one,
-          # as if there's a failed compilation, the thread pool will stop
-          # processing any new thread.
-          ThreadPool.new(:max_threads => number_of_workers).wrap do |pool|
-            @vm_reuser.each do |vm_data|
-              pool.process { tear_down_vm(vm_data) }
-            end
-          end
-        end
-      end
-    end
-
-    def process_task(task)
-      package_desc = task.package.desc
-      stemcell_desc = task.stemcell.desc
-      task_desc = "package `#{package_desc}' for stemcell `#{stemcell_desc}'"
-
-      with_thread_name("compile_package(#{package_desc}, #{stemcell_desc})") do
-        if director_job_cancelled?
-          @logger.info("Cancelled compiling #{task_desc}")
-        else
-          @event_log.track(package_desc) do
-            @logger.info("Compiling #{task_desc}")
-            compile_package(task)
-            @logger.info("Finished compiling #{task_desc}")
-            enqueue_unblocked_tasks(task)
-          end
-        end
-      end
-    end
-    private :compile_packages, :process_task
-
     def compile_package(task)
       package = task.package
       stemcell = task.stemcell
 
       with_compile_lock(package.id, stemcell.id) do
         # Check if the package was compiled in a parallel deployment
-        compiled_package = find_compiled_package(task)
+        compiled_package = task.find_compiled_package(@logger, @event_log)
         if compiled_package.nil?
           build = Models::CompiledPackage.generate_build_number(package, stemcell)
           task_result = nil
@@ -257,20 +201,6 @@ module Bosh::Director
       end
     end
 
-    def enqueue_unblocked_tasks(task)
-      @tasks_mutex.synchronize do
-        @logger.info("Unblocking dependents of " +
-                     "`#{task.package.desc}` for `#{task.stemcell.desc}`")
-        task.dependent_tasks.each do |dep_task|
-          if dep_task.ready_to_compile?
-            @logger.info("Package `#{dep_task.package.desc}' now ready to be " +
-                         "compiled for `#{dep_task.stemcell.desc}'")
-            @ready_tasks << dep_task
-          end
-        end
-      end
-    end
-
     # This method will create a VM for each stemcell in the stemcells array
     # passed in.  The VMs are yielded and their destruction is ensured.
     # @param [Models::Stemcell] stemcell The stemcells that need to have
@@ -350,45 +280,76 @@ module Bosh::Director
       end
     end
 
-    # @param [CompileTask] task
-    # @return [Models::CompiledPackage]
-    def find_compiled_package(task)
-      package = task.package
-      stemcell = task.stemcell
-      dependency_key = task.dependency_key
-
-      # Check if this package is already compiled
-      compiled_package = Models::CompiledPackage[
-        :package_id => package.id,
-        :stemcell_id => stemcell.id,
-        :dependency_key => dependency_key
-      ]
-      if compiled_package
-        @logger.info("Found compiled version of package `#{package.desc}' " +
-                     "for stemcell `#{stemcell.desc}'")
-      else
-        if Config.use_compiled_package_cache?
-          if BlobUtil.exists_in_global_cache?(package, task.cache_key)
-            @event_log.track("Downloading '#{package.desc}' from global cache") do
-              # has side effect of putting CompiledPackage model in db
-              compiled_package = BlobUtil.fetch_from_global_cache(package, stemcell, task.cache_key, dependency_key)
+    private
+
+    def compile_packages
+      @event_log.begin_stage("Compiling packages", compilation_count)
+      number_of_workers = @deployment_plan.compilation.workers
+
+      begin
+        ThreadPool.new(:max_threads => number_of_workers).wrap do |pool|
+          loop do
+            # process as many tasks without waiting
+            loop do
+              break if director_job_cancelled?
+              task = @tasks_mutex.synchronize { @ready_tasks.pop }
+              break if task.nil?
+
+              pool.process { process_task(task) }
             end
+
+            break if !pool.working? && (director_job_cancelled? || @ready_tasks.empty?)
+            sleep(0.1)
           end
         end
-
-        if compiled_package
-          @logger.info("Package `Found compiled version of package `#{package.desc}'" +
-                       "for stemcell `#{stemcell.desc}' in global cache")
-        else
-          @logger.info("Package `#{package.desc}' " +
-                       "needs to be compiled on `#{stemcell.desc}'")
+      ensure
+        # Delete all of the VMs if we were reusing compilation VMs. This can't
+        # happen until everything was done compiling.
+        if @deployment_plan.compilation.reuse_compilation_vms
+          # Using a new ThreadPool instead of reusing the previous one,
+          # as if there's a failed compilation, the thread pool will stop
+          # processing any new thread.
+          ThreadPool.new(:max_threads => number_of_workers).wrap do |pool|
+            @vm_reuser.each do |vm_data|
+              pool.process { tear_down_vm(vm_data) }
+            end
+          end
         end
       end
+    end
 
-      compiled_package
+    def enqueue_unblocked_tasks(task)
+      @tasks_mutex.synchronize do
+        @logger.info("Unblocking dependents of " +
+                       "`#{task.package.desc}` for `#{task.stemcell.desc}`")
+        task.dependent_tasks.each do |dep_task|
+          if dep_task.ready_to_compile?
+            @logger.info("Package `#{dep_task.package.desc}' now ready to be " +
+                           "compiled for `#{dep_task.stemcell.desc}'")
+            @ready_tasks << dep_task
+          end
+        end
+      end
     end
 
-    private
+    def process_task(task)
+      package_desc = task.package.desc
+      stemcell_desc = task.stemcell.desc
+      task_desc = "package `#{package_desc}' for stemcell `#{stemcell_desc}'"
+
+      with_thread_name("compile_package(#{package_desc}, #{stemcell_desc})") do
+        if director_job_cancelled?
+          @logger.info("Cancelled compiling #{task_desc}")
+        else
+          @event_log.track(package_desc) do
+            @logger.info("Compiling #{task_desc}")
+            compile_package(task)
+            @logger.info("Finished compiling #{task_desc}")
+            enqueue_unblocked_tasks(task)
+          end
+        end
+      end
+    end
 
     def director_job_cancelled?
       @director_job && @director_job.task_cancelled?

data/lib/bosh/director/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1134
+  version: 1.5.0.pre.1138
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2013-10-22 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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !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.1134
+        version: 1.5.0.pre.1138
   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.1134
+        version: 1.5.0.pre.1138
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -445,7 +445,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  bdd163'
+  903d52'
 email: support@cloudfoundry.com
 executables:
 - bosh-director