cloudfoundry · cf-bosh · Mar 28, 2013 · Mar 28, 2013 · Mar 28, 2013
diff --git a/director/lib/director.rb b/director/lib/director.rb
@@ -20,6 +20,7 @@ module Director
 require "time"
 require "zlib"
 
+require "common/exec"
 require "common/properties"
 
 require "bcrypt"

diff --git a/director/lib/director/api/api_helper.rb b/director/lib/director/api/api_helper.rb
@@ -62,6 +62,8 @@ def write_file(path, stream, chunk_size = READ_CHUNK_SIZE)
         File.open(path, "w") do |file|
           file.write(buffer) until stream.read(chunk_size, buffer).nil?
         end
+      rescue SystemCallError => e
+        raise SystemError, e.message
       end
     end
   end

diff --git a/director/lib/director/errors.rb b/director/lib/director/errors.rb
@@ -190,4 +190,6 @@ def self.err(error_code, response_code = BAD_REQUEST)
 
   RpcRemoteException = err(450001)
   RpcTimeout = err(450002)
+
+  SystemError = err(500000, INTERNAL_SERVER_ERROR)
 end
diff --git a/director/lib/director/jobs/update_stemcell.rb b/director/lib/director/jobs/update_stemcell.rb
@@ -23,11 +23,11 @@ def perform
         stemcell_dir = Dir.mktmpdir("stemcell")
 
         track_and_log("Extracting stemcell archive") do
-          output = `tar -C #{stemcell_dir} -xzf #{@stemcell_file} 2>&1`
-          if $?.exitstatus != 0
+          result = Bosh::Exec.sh("tar -C #{stemcell_dir} -xzf #{@stemcell_file} 2>&1", :on_error => :return)
+          if result.failed?
             raise StemcellInvalidArchive,
-                  "Invalid stemcell archive, tar returned #{$?.exitstatus}, " +
-                  "output: #{output}"
+                  "Invalid stemcell archive, tar returned #{result.exit_status}, " +
+                  "output: #{result.output}"
           end
         end
 

diff --git a/director/spec/unit/api/api_helper_spec.rb b/director/spec/unit/api/api_helper_spec.rb
@@ -0,0 +1,31 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+
+require File.expand_path("../../../spec_helper", __FILE__)
+
+describe Bosh::Director::Api::ApiHelper do
+  include Bosh::Director::Api::ApiHelper
+
+  before(:each) do
+    @tmpdir = Dir.mktmpdir("base_dir")
+  end
+
+  describe :write_file do
+    it "should write a file" do
+      file_in = StringIO.new("contents")
+      file_out = File.join(@tmpdir, SecureRandom.uuid)
+
+      write_file(file_out, file_in)
+      File.read(file_out).should == "contents"
+    end
+
+    it "should raise an exception if there's any system error call" do
+      file_in = StringIO.new("contents")
+      file_out = File.join(@tmpdir, SecureRandom.uuid)
+      File.should_receive(:open).with(file_out, "w").and_raise(Errno::ENOSPC)
+
+      expect {
+        write_file(file_out, file_in)
+      }.to raise_exception(Bosh::Director::SystemError)
+    end
+  end
+end
diff --git a/director/spec/unit/jobs/update_stemcell_spec.rb b/director/spec/unit/jobs/update_stemcell_spec.rb
@@ -59,4 +59,14 @@
     lambda { update_stemcell_job.perform }.should raise_exception(Bosh::Director::StemcellAlreadyExists)
   end
 
+  it "should fail if cannot extract stemcell" do
+    result = Bosh::Exec::Result.new("cmd", "output", 1)
+    Bosh::Exec.should_receive(:sh).and_return(result)
+
+    update_stemcell_job = Bosh::Director::Jobs::UpdateStemcell.new(@stemcell_file.path)
+
+    expect {
+      update_stemcell_job.perform
+    }.to raise_exception(Bosh::Director::StemcellInvalidArchive)
+  end
 end