bosh-director 1.5.0.pre.1142 → 1.5.0.pre.1145

data/lib/bosh/director/agent_client.rb

@@ -61,8 +61,15 @@ module Bosh::Director
       {"state" => "done", "value" => msg, "agent_task_id" => nil}
     end
 
-    [:apply, :compile_package, :drain, :fetch_logs, :migrate_disk, :mount_disk,
-     :stop, :unmount_disk].each do |method|
+    [ :apply,
+      :compile_package,
+      :drain,
+      :fetch_logs,
+      :migrate_disk,
+      :mount_disk,
+      :stop,
+      :unmount_disk,
+    ].each do |method|
       define_method (method) do |*args|
         task = AgentClient.convert_old_message_to_new(super(*args))
         while task["state"] == "running"
@@ -73,6 +80,5 @@ module Bosh::Director
         task["value"]
       end
     end
-
   end
 end

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

@@ -585,12 +585,7 @@ module Bosh::Director
         end
       end
 
-      # JMS and MB: We don't know why this code exists. According to JP it shouldn't. We want to remove it.
-      # To get comforable with that idea, we log something we can look for in production.
-      #
-      # GET /resources/deadbeef
       get '/resources/:id' do
-        @logger.warn('Something is proxying a blob through the director. Find out why before we remove this method. ZAUGYZ')
         tmp_file = @resource_manager.get_resource_path(params[:id])
         send_disposable_file(tmp_file, :type => 'application/x-gzip')
       end

data/lib/bosh/director/package_compiler.rb

@@ -46,113 +46,24 @@ module Bosh::Director
     # in the current deployment and kicks off compilation.
     # @return [void]
     def compile
-      @logger.info("Generating a list of compile tasks")
+      @logger.info('Generating a list of compile tasks')
       prepare_tasks
 
       @compile_tasks.each_value do |task|
         if task.ready_to_compile?
-          @logger.info("Package `#{task.package.desc}' is ready to be " +
-                       "compiled for stemcell `#{task.stemcell.desc}'")
+          @logger.info("Package `#{task.package.desc}' is ready to be compiled for stemcell `#{task.stemcell.desc}'")
           @ready_tasks << task
         end
       end
 
       if @ready_tasks.empty?
-        @logger.info("All packages are already compiled")
+        @logger.info('All packages are already compiled')
       else
         compile_packages
         director_job_checkpoint
       end
     end
 
-    # Generates all compilation tasks required to compile all packages
-    # in the jobs defined by deployment plan
-    # @return [void]
-    def prepare_tasks
-      @event_log.begin_stage("Preparing package compilation")
-
-      @event_log.track("Finding packages to compile") do
-        @deployment_plan.jobs.each do |job|
-          job_desc = "#{job.release.name}/#{job.name}"
-          stemcell = job.resource_pool.stemcell
-
-          @logger.info("Job `#{job_desc}' needs to run " +
-                       "on stemcell `#{stemcell.model.desc}'")
-
-          job.templates.each do |template|
-            template.package_models.each do |package|
-              generate_compile_task(job, package, stemcell.model)
-            end
-          end
-        end
-      end
-    end
-
-    # Generates compilation task for a given (package, stemcell) tuple
-    # @param [DeploymentPlan::Job] job Job spec
-    # @param [Models::Package] package Package model
-    # @param [Models::Stemcell] stemcell Stemcell model
-    # @return [CompileTask] Compilation task for this package/stemcell tuple
-    def generate_compile_task(job, package, stemcell)
-      # Our assumption here is that package dependency graph
-      # has no cycles: this is being enforced on release upload.
-      # Other than that it's a vanilla DFS.
-
-      @logger.info("Checking whether package `#{package.desc}' needs " +
-                   "to be compiled for stemcell `#{stemcell.desc}'")
-      task_key = [package.id, stemcell.id]
-      task = @compile_tasks[task_key]
-
-      if task # We already visited this task and its dependencies
-        task.add_job(job) # But we still need to register this job with task
-        return task
-      end
-
-      dependencies = package.dependency_set.map do |name|
-        job.release.get_package_model_by_name(name)
-      end
-
-      task = CompileTask.new(package, stemcell, dependencies, job)
-
-      compiled_package = task.find_compiled_package(@logger, @event_log)
-      if compiled_package
-        task.use_compiled_package(compiled_package)
-      end
-
-      @logger.info("Processing package `#{package.desc}' dependencies")
-      dependencies.each do |dependency|
-        @logger.info("Package `#{package.desc}' depends on " +
-                     "package `#{dependency.desc}'")
-        dependency_task = generate_compile_task(job, dependency, stemcell)
-        task.add_dependency(dependency_task)
-      end
-
-      @compile_tasks[task_key] = task
-      task
-    end
-
-    def reserve_network
-      reservation = NetworkReservation.new_dynamic
-
-      @network_mutex.synchronize do
-        @network.reserve(reservation)
-      end
-
-      if !reservation.reserved?
-        raise PackageCompilationNetworkNotReserved,
-          "Could not reserve network for package compilation: " +
-          reservation.error.to_s
-      end
-
-      reservation
-    end
-
-    def release_network(reservation)
-      @network_mutex.synchronize do
-        @network.release(reservation)
-      end
-    end
-
     def compile_package(task)
       package = task.package
       stemcell = task.stemcell
@@ -171,27 +82,27 @@ module Bosh::Director
                                             package.sha1, package.name,
                                             "#{package.version}.#{build}",
                                             task.dependency_spec)
-            task_result = agent_task["result"]
+            task_result = agent_task['result']
           end
 
           compiled_package = Models::CompiledPackage.create do |p|
             p.package = package
             p.stemcell = stemcell
-            p.sha1 = task_result["sha1"]
+            p.sha1 = task_result['sha1']
             p.build = build
-            p.blobstore_id = task_result["blobstore_id"]
+            p.blobstore_id = task_result['blobstore_id']
             p.dependency_key = task.dependency_key
           end
 
           if Config.use_compiled_package_cache?
             if BlobUtil.exists_in_global_cache?(package, task.cache_key)
-              @logger.info("Already exists in global package cache, skipping upload")
+              @logger.info('Already exists in global package cache, skipping upload')
             else
-              @logger.info("Uploading to global package cache")
+              @logger.info('Uploading to global package cache')
               BlobUtil.save_to_global_cache(compiled_package, task.cache_key)
             end
           else
-            @logger.info("Global blobstore not configured, skipping upload")
+            @logger.info('Global blobstore not configured, skipping upload')
           end
 
           @counter_mutex.synchronize { @compilations_performed += 1 }
@@ -213,8 +124,7 @@ module Bosh::Director
       if @deployment_plan.compilation.reuse_compilation_vms
         vm_data = @vm_reuser.get_vm(stemcell)
         if vm_data
-          @logger.info("Reusing compilation VM `#{vm_data.vm.cid}' for " +
-                       "stemcell `#{stemcell.desc}'")
+          @logger.info("Reusing compilation VM `#{vm_data.vm.cid}' for stemcell `#{stemcell.desc}'")
           begin
             yield vm_data
           ensure
@@ -226,8 +136,7 @@ module Bosh::Director
         if @vm_reuser.get_num_vms(stemcell) >=
           @deployment_plan.compilation.workers
           raise PackageCompilationNotEnoughWorkersForReuse,
-                "There should never be more VMs for a stemcell than the " +
-                "number of workers in reuse_compilation_vms mode"
+                'There should never be more VMs for a stemcell than the number of workers in reuse_compilation_vms mode'
         end
       end
 
@@ -267,8 +176,63 @@ module Bosh::Director
       end
     end
 
-    # Tears down a VM and releases the network reservations.
-    # @param [VmData] vm_data The VmData object for the VM to tear down.
+    private
+
+    def prepare_tasks
+      @event_log.begin_stage('Preparing package compilation')
+
+      @event_log.track('Finding packages to compile') do
+        @deployment_plan.jobs.each do |job|
+          job_desc = "#{job.release.name}/#{job.name}"
+          stemcell = job.resource_pool.stemcell
+
+          @logger.info("Job `#{job_desc}' needs to run on stemcell `#{stemcell.model.desc}'")
+
+          job.templates.each do |template|
+            template.package_models.each do |package|
+              generate_compile_task(job, package, stemcell.model)
+            end
+          end
+        end
+      end
+    end
+
+    def generate_compile_task(job, package, stemcell)
+      # Our assumption here is that package dependency graph
+      # has no cycles: this is being enforced on release upload.
+      # Other than that it's a vanilla DFS.
+
+      @logger.info("Checking whether package `#{package.desc}' needs to be compiled for stemcell `#{stemcell.desc}'")
+      task_key = [package.id, stemcell.id]
+      task = @compile_tasks[task_key]
+
+      if task # We already visited this task and its dependencies
+        task.add_job(job) # But we still need to register this job with task
+        return task
+      end
+
+      dependencies = package.dependency_set.map do |name|
+        job.release.get_package_model_by_name(name)
+      end
+
+      task = CompileTask.new(package, stemcell, dependencies, job)
+
+      compiled_package = task.find_compiled_package(@logger, @event_log)
+      if compiled_package
+        task.use_compiled_package(compiled_package)
+      end
+
+      @logger.info("Processing package `#{package.desc}' dependencies")
+      dependencies.each do |dependency|
+        @logger.info("Package `#{package.desc}' depends on package `#{dependency.desc}'")
+        dependency_task = generate_compile_task(job, dependency, stemcell)
+        task.add_dependency(dependency_task)
+      end
+
+      @compile_tasks[task_key] = task
+      task
+    end
+
     def tear_down_vm(vm_data)
       vm = vm_data.vm
       if vm.exists?
@@ -280,10 +244,29 @@ module Bosh::Director
       end
     end
 
-    private
+    def reserve_network
+      reservation = NetworkReservation.new_dynamic
+
+      @network_mutex.synchronize do
+        @network.reserve(reservation)
+      end
+
+      unless reservation.reserved?
+        raise PackageCompilationNetworkNotReserved,
+              "Could not reserve network for package compilation: #{reservation.error}"
+      end
+
+      reservation
+    end
+
+    def release_network(reservation)
+      @network_mutex.synchronize do
+        @network.release(reservation)
+      end
+    end
 
     def compile_packages
-      @event_log.begin_stage("Compiling packages", compilation_count)
+      @event_log.begin_stage('Compiling packages', compilation_count)
       number_of_workers = @deployment_plan.compilation.workers
 
       begin
@@ -320,12 +303,10 @@ module Bosh::Director
 
     def enqueue_unblocked_tasks(task)
       @tasks_mutex.synchronize do
-        @logger.info("Unblocking dependents of " +
-                       "`#{task.package.desc}` for `#{task.stemcell.desc}`")
+        @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}'")
+            @logger.info("Package `#{dep_task.package.desc}' now ready to be compiled for `#{dep_task.stemcell.desc}'")
             @ready_tasks << dep_task
           end
         end
@@ -361,9 +342,9 @@ module Bosh::Director
 
     def configure_vm(vm, agent, network_settings)
       state = {
-        "deployment" => @deployment_plan.name,
-        "resource_pool" => "package_compiler",
-        "networks" => network_settings
+        'deployment' => @deployment_plan.name,
+        'resource_pool' => 'package_compiler',
+        'networks' => network_settings
       }
 
       vm.update(:apply_spec => state)

data/lib/bosh/director/version.rb

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

metadata

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