bosh_agent 1.5.0.pre.1141 → 1.5.0.pre.1142

data/lib/bosh_agent/message/compile_package.rb

@@ -35,7 +35,7 @@ module Bosh::Agent
       def initialize(args)
         bsc_provider = Bosh::Agent::Config.blobstore_provider
         bsc_options = Bosh::Agent::Config.blobstore_options
-        @blobstore_client = Bosh::Blobstore::Client.create(bsc_provider, bsc_options)
+        @blobstore_client = Bosh::Blobstore::Client.safe_create(bsc_provider, bsc_options)
         @blobstore_id, @sha1, @package_name, @package_version, @dependencies = args
 
         @base_dir = Bosh::Agent::Config.base_dir

data/lib/bosh_agent/message/logs.rb

@@ -87,11 +87,9 @@ module Bosh::Agent
       def upload_tarball(path)
         bsc_options  = Bosh::Agent::Config.blobstore_options
         bsc_provider = Bosh::Agent::Config.blobstore_provider
-
-        blobstore = Bosh::Blobstore::Client.create(bsc_provider, bsc_options)
+        blobstore = Bosh::Blobstore::Client.safe_create(bsc_provider, bsc_options)
 
         logger.info("Uploading tarball to blobstore")
-
         blobstore_id = nil
 
         File.open(path) do |f|

data/lib/bosh_agent/util.rb

@@ -16,37 +16,30 @@ module Bosh::Agent
       def unpack_blob(blobstore_id, sha1, install_path)
         bsc_options = Bosh::Agent::Config.blobstore_options
         bsc_provider = Bosh::Agent::Config.blobstore_provider
-        blobstore_client = Bosh::Blobstore::Client.create(bsc_provider, bsc_options)
+        blobstore_client = Bosh::Blobstore::Client.safe_create(bsc_provider, bsc_options)
 
         data_tmp = File.join(base_dir, 'data', 'tmp')
         FileUtils.mkdir_p(data_tmp)
 
         begin
           tf = Tempfile.open(blobstore_id, data_tmp)
-          logger.info("Retrieving blob: #{blobstore_id}")
 
-          blobstore_client.get(blobstore_id, tf)
-          logger.info("Done retrieving blob")
-
-          tf.flush
-          blob_data_file = tf.path
+          begin
+            logger.info("Retrieving blob '#{blobstore_id}'")
+            blobstore_client.get(blobstore_id, tf, sha1: sha1)
+          rescue Bosh::Blobstore::BlobstoreError => e
+            raise Bosh::Agent::MessageHandlerError.new(e.inspect)
+          end
 
-          logger.info("creating #{install_path}")
+          logger.info("Creating '#{install_path}'")
           FileUtils.mkdir_p(install_path)
 
-          blob_sha1 = Digest::SHA1.file(blob_data_file).hexdigest
-          logger.info("hexdigest of #{blob_data_file}")
-
-          unless blob_sha1 == sha1
-            raise Bosh::Agent::MessageHandlerError,
-                  "Expected sha1: #{sha1}, Downloaded sha1: #{blob_sha1}, Blobstore ID: #{blobstore_id}, Install Path: #{install_path}"
-          end
-
-          logger.info("Installing to: #{install_path}")
+          logger.info("Installing to '#{install_path}'")
           Dir.chdir(install_path) do
-            output = `tar --no-same-owner -zxvf #{blob_data_file}`
-            raise Bosh::Agent::MessageHandlerError.new(
-              "Failed to unpack blob", output) unless $?.exitstatus == 0
+            output = `tar --no-same-owner -zxvf #{tf.path} 2>&1`
+            unless $?.exitstatus == 0
+              raise Bosh::Agent::MessageHandlerError.new("Failed to unpack blob", output)
+            end
           end
         rescue Exception => e
           logger.info("Failure unpacking blob: #{e.inspect} #{e.backtrace}")
@@ -57,7 +50,6 @@ module Bosh::Agent
             tf.unlink
           end
         end
-
       end
 
       # @param [Hash] Instance spec

data/lib/bosh_agent/version.rb

@@ -2,7 +2,7 @@
 
 module Bosh
   module Agent
-    VERSION = '1.5.0.pre.1141'
+    VERSION = '1.5.0.pre.1142'
     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.1141
+  version: 1.5.0.pre.1142
   prerelease: 6
 platform: ruby
 authors:
@@ -162,7 +162,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1141
+        version: 1.5.0.pre.1142
   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.1141
+        version: 1.5.0.pre.1142
 - !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.1141
+        version: 1.5.0.pre.1142
   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.1141
+        version: 1.5.0.pre.1142
 - !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.1141
+        version: 1.5.0.pre.1142
   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.1141
+        version: 1.5.0.pre.1142
 - !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.
 
-  903d52'
+  31eb14'
 email: support@cloudfoundry.com
 executables:
 - bosh_agent