bosh-director 1.5.0.pre.1381 → 1.5.0.pre.1390

data/lib/bosh/director.rb

@@ -21,7 +21,6 @@ require 'yaml'
 require 'time'
 require 'zlib'
 
-require 'common/runs_commands'
 require 'common/exec'
 require 'common/properties'
 

data/lib/bosh/director/compressed_rendered_job_templates.rb

@@ -0,0 +1,10 @@
+module Bosh::Director
+  class CompressedRenderedJobTemplates
+    def initialize(rendered_job_templates)
+    end
+
+    def contents
+      'contents of fake-compressed-job-templates.tgz'
+    end
+  end
+end

data/lib/bosh/director/deployment_plan/assembler.rb

@@ -378,22 +378,26 @@ module Bosh::Director
 
     # @param [DeploymentPlan::Instance]
     def bind_instance_vm(instance)
-      job = instance.job
-      idle_vm = instance.idle_vm
+      @event_log.track("#{instance.job.name}/#{instance.index}") do
+        idle_vm = instance.idle_vm
 
-      instance.model.update(:vm => idle_vm.vm)
-
-      @event_log.track("#{job.name}/#{instance.index}") do
         # Apply the assignment to the VM
-        state = idle_vm.current_state
-        state["job"] = job.spec
-        state["index"] = instance.index
-        state["release"] = job.release.spec
-
-        idle_vm.vm.update(:apply_spec => state)
-
         agent = AgentClient.with_defaults(idle_vm.vm.agent_id)
+        state = idle_vm.current_state
+        state['job'] = instance.job.spec
+        state['index'] = instance.index
+        state['release'] = instance.job.release.spec
         agent.apply(state)
+
+        # Our assumption here is that director database access
+        # is much less likely to fail than VM agent communication
+        # so we only update database after we see a successful agent apply.
+        # If database update fails subsequent deploy will try to
+        # assign a new VM to this instance which is ok.
+        idle_vm.vm.db.transaction do
+          idle_vm.vm.update(:apply_spec => state)
+          instance.model.update(:vm => idle_vm.vm)
+        end
         instance.current_state = state
       end
     end

data/lib/bosh/director/rendered_templates_uploader.rb

@@ -1,6 +1,16 @@
+require 'bosh/director/rendered_templates_writer'
+require 'bosh/director/compressed_rendered_job_templates'
+require 'blobstore_client/null_blobstore_client'
+
 module Bosh::Director
   class RenderedTemplatesUploader
-    def upload(rendered_templates)
+    def initialize(blobstore = Bosh::Blobstore::NullBlobstoreClient.new)
+      @blobstore = blobstore
+    end
+
+    def upload(rendered_job_templates)
+      compressed_archive = CompressedRenderedJobTemplates.new(rendered_job_templates)
+      @blobstore.create(compressed_archive.contents)
     end
   end
 end

data/lib/bosh/director/rendered_templates_writer.rb

@@ -0,0 +1,24 @@
+require 'fileutils'
+
+module Bosh::Director
+  class RenderedTemplatesWriter
+    def write(rendered_templates, output_dir)
+      rendered_templates.each do |job_template|
+        job_template_dir = File.join(output_dir, job_template.name)
+        Dir.mkdir(job_template_dir)
+
+        File.open(File.join(job_template_dir, 'monit'), 'w') do |f|
+          f.write(job_template.monit)
+        end
+
+        job_template.templates.each do |file_template|
+          file_template_dest = File.join(job_template_dir, file_template.dest_name)
+          FileUtils.mkdir_p(File.dirname(file_template_dest))
+          File.open(file_template_dest, 'w') do |f|
+            f.write(file_template.contents)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/bosh/director/tar_gzipper.rb

@@ -3,8 +3,6 @@ require 'open3'
 
 module Bosh::Director
   class TarGzipper
-    include Bosh::RunsCommands
-
     # @param [String] base_dir the directory from which the tar command is run
     # @param [String, Array] sources the relative paths to include
     # @param [String] dest the destination filename for the tgz output

data/lib/bosh/director/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1381
+  version: 1.5.0.pre.1390
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-21 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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !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.1381
+        version: 1.5.0.pre.1390
   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.1381
+        version: 1.5.0.pre.1390
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -461,7 +461,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH Director
 
-  e745e8'
+  70ab6e'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -550,6 +550,7 @@ files:
 - lib/bosh/director/compiled_package_group.rb
 - lib/bosh/director/compiled_package_manifest.rb
 - lib/bosh/director/compiled_packages_exporter.rb
+- lib/bosh/director/compressed_rendered_job_templates.rb
 - lib/bosh/director/config.rb
 - lib/bosh/director/cycle_helper.rb
 - lib/bosh/director/db_backup.rb
@@ -661,6 +662,7 @@ files:
 - lib/bosh/director/rendered_job_instance_hasher.rb
 - lib/bosh/director/rendered_job_template.rb
 - lib/bosh/director/rendered_templates_uploader.rb
+- lib/bosh/director/rendered_templates_writer.rb
 - lib/bosh/director/resource_pool_updater.rb
 - lib/bosh/director/scheduler.rb
 - lib/bosh/director/sequel.rb