bosh_agent 1.5.0.pre.1257 → 1.5.0.pre.1259

data/lib/bosh_agent/apply_plan/helpers.rb

@@ -6,15 +6,13 @@ module Bosh::Agent
 
       def validate_spec(spec)
         unless spec.is_a?(Hash)
-          raise ArgumentError, "Invalid #{self.class} spec: " +
-              "Hash expected, #{spec.class} given"
+          raise ArgumentError, "Invalid #{self.class} spec: Hash expected, #{spec.class} given"
         end
 
         required_keys = %w(name version sha1 blobstore_id)
         missing_keys = required_keys.select { |k| spec[k].nil? }
         unless missing_keys.empty?
-          raise ArgumentError, "Invalid #{self.class} spec: " +
-              "#{missing_keys.join(', ')} missing"
+          raise ArgumentError, "Invalid #{self.class} spec: #{missing_keys.join(', ')} missing"
         end
       end
 
@@ -22,9 +20,17 @@ module Bosh::Agent
         FileUtils.mkdir_p(File.dirname(@install_path))
         FileUtils.mkdir_p(File.dirname(@link_path))
 
-        Bosh::Agent::Util.unpack_blob(@blobstore_id, @checksum, @install_path)
+        # Once directory is created we'll never do the fetch a second time;
+        # we make a best effort to ensure directory is in a consistent state
+        unless Dir.exist?(@install_path)
+          Bosh::Agent::Util.unpack_blob(@blobstore_id, @checksum, @install_path)
+        end
+      end
+
+      def fetch_bits_and_symlink
+        fetch_bits
         Bosh::Agent::Util.create_symlink(@install_path, @link_path)
       end
     end
   end
-end
+end

data/lib/bosh_agent/apply_plan/job.rb

@@ -39,8 +39,12 @@ module Bosh::Agent
         @link_path = File.join(@base_dir, 'jobs', @template)
       end
 
-      def install
+      def prepare_for_install
         fetch_bits
+      end
+
+      def install
+        fetch_bits_and_symlink
         bind_configuration
         harden_permissions
       rescue SystemCallError => e

data/lib/bosh_agent/apply_plan/package.rb

@@ -25,11 +25,12 @@ module Bosh::Agent
         @link_path = File.join(@base_dir, 'packages', @name)
       end
 
+      def prepare_for_install
+        fetch_bits
+      end
+
       def install_for_job(job)
-        unless @installed_for_sys
-          fetch_bits
-          @installed_for_sys = true
-        end
+        fetch_bits_and_symlink
         create_symlink_in_job(job) if job
       rescue SystemCallError => e
         install_failed("System call error: #{e.message}")

data/lib/bosh_agent/apply_plan/plan.rb

@@ -88,10 +88,6 @@ module Bosh::Agent
           job.configure(job_index)
         end
       end
-
-      def has_prepared_spec?(new_spec)
-        @spec['prepared_spec'] == new_spec
-      end
     end
   end
 end

data/lib/bosh_agent/message/apply.rb

@@ -108,9 +108,7 @@ module Bosh::Agent
       end
 
       def apply_job
-        if @old_plan.has_prepared_spec?(@new_spec)
-          logger.info("New jobs already installed")
-        elsif @new_plan.has_jobs?
+        if @new_plan.has_jobs?
           @new_plan.install_jobs
         else
           logger.info("No job")
@@ -118,9 +116,7 @@ module Bosh::Agent
       end
 
       def apply_packages
-        if @old_plan.has_prepared_spec?(@new_spec)
-          logger.info("New packages already installed")
-        elsif @new_plan.has_packages?
+        if @new_plan.has_packages?
           @new_plan.install_packages
         else
           logger.info("No packages")

data/lib/bosh_agent/message/prepare.rb

@@ -1,86 +1,25 @@
 module Bosh::Agent::Message
   class Prepare < Base
-    def initialize(args)
-      @platform = Bosh::Agent::Config.platform
-
-      if args.size < 1
-        raise ArgumentError, "not enough arguments"
-      end
-
-      @new_spec = args.first
-      unless @new_spec.is_a?(Hash)
-        raise ArgumentError, "invalid spec, Hash expected, " +
-          "#{@new_spec.class} given"
-      end
-    end
-
-    def prepare
-      initialize_plans
-
-      %w(bosh jobs packages monit).each do |dir|
-        FileUtils.mkdir_p(File.join(base_dir, dir))
-      end
-
-      logger.info("Preparing: #{@new_spec.inspect}")
-
-      if @new_plan.configured?
-        begin
-          apply_job
-          apply_packages
-          log_bit_download_with_agent_state
-        rescue Exception => e
-          raise Bosh::Agent::MessageHandlerError,
-                "#{e.message}: #{e.backtrace}"
-        end
-      end
+    def self.process(args)
+      new(*args).run
     end
 
-    private
-
-    def initialize_plans
-      initialize_networks
-
-      @old_spec = Bosh::Agent::Config.state.to_hash
-
-      @old_plan = Bosh::Agent::ApplyPlan::Plan.new(@old_spec)
-      @new_plan = Bosh::Agent::ApplyPlan::Plan.new(@new_spec)
-    end
-
-    def initialize_networks
-      if @new_spec["networks"]
-        @new_spec["networks"].each do |network, properties|
-          infrastructure = Bosh::Agent::Config.infrastructure
-          network_settings =
-            infrastructure.get_network_settings(network, properties)
-          logger.debug("current network settings from VM: #{network_settings.inspect}")
-          logger.debug("new network settings to be applied: #{properties.inspect}")
-          if network_settings
-            @new_spec["networks"][network].merge!(network_settings)
-            logger.debug("merged network settings: #{@new_spec["networks"].inspect}")
-          end
-        end
-      end
-    end
-
-    def apply_job
-      if @new_plan.has_jobs?
-        @new_plan.install_jobs
-      else
-        logger.info("No job")
-      end
-    end
+    def initialize(apply_spec)
+      @platform = Bosh::Agent::Config.platform
+      @apply_spec = apply_spec
 
-    def apply_packages
-      if @new_plan.has_packages?
-        @new_plan.install_packages
-      else
-        logger.info("No packages")
+      unless @apply_spec.is_a?(Hash)
+        raise ArgumentError, "invalid spec, Hash expected, #{@apply_spec.class} given"
       end
     end
 
-    def log_bit_download_with_agent_state
-      @old_spec['prepared_spec'] = @new_spec
-      Bosh::Agent::Config.state.write(@old_spec)
+    def run
+      plan = Bosh::Agent::ApplyPlan::Plan.new(@apply_spec)
+      plan.jobs.each(&:prepare_for_install)
+      plan.packages.each(&:prepare_for_install)
+      {}
+    rescue Exception => e
+      raise Bosh::Agent::MessageHandlerError, "#{e.inspect}\n#{e.backtrace}"
     end
   end
 end

data/lib/bosh_agent/util.rb

@@ -31,16 +31,22 @@ module Bosh::Agent
             raise Bosh::Agent::MessageHandlerError.new(e.inspect)
           end
 
-          logger.info("Creating '#{install_path}'")
-          FileUtils.mkdir_p(install_path)
+          partial_install_path = "#{install_path}-bosh-agent-unpack"
+          logger.info("Creating '#{partial_install_path}'")
+          FileUtils.rm_rf(partial_install_path)
+          FileUtils.mkdir_p(partial_install_path)
 
-          logger.info("Installing to '#{install_path}'")
-          Dir.chdir(install_path) do
+          logger.info("Installing to '#{partial_install_path}'")
+          Dir.chdir(partial_install_path) do
             output = `tar --no-same-owner -zxvf #{tf.path} 2>&1`
             unless $?.exitstatus == 0
-              raise Bosh::Agent::MessageHandlerError.new("Failed to unpack blob", output)
+              raise Bosh::Agent::MessageHandlerError.new('Failed to unpack blob', output)
             end
           end
+
+          # Only move contents of the blob to install path at the end
+          # to avoid corrupted package directory
+          FileUtils.mv(partial_install_path, install_path)
         rescue Exception => e
           logger.info("Failure unpacking blob: #{e.inspect} #{e.backtrace}")
           raise e

data/lib/bosh_agent/version.rb

@@ -2,7 +2,7 @@
 
 module Bosh
   module Agent
-    VERSION = '1.5.0.pre.1257'
+    VERSION = '1.5.0.pre.1259'
     BOSH_PROTOCOL = "1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_agent
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1257
+  version: 1.5.0.pre.1259
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netaddr
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -186,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
@@ -194,7 +194,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1257
+        version: 1.5.0.pre.1259
 - !ruby/object:Gem::Dependency
   name: rspec-fire
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
 description: ! 'This agent listens for instructions from the bosh director on each
   server that bosh manages.
 
-  11054b'
+  65813d'
 email: support@cloudfoundry.com
 executables:
 - bosh_agent