chef-metal 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5fdc35ab0b1d5515d7ef8c93e9818b9be68bb62
-  data.tar.gz: 928fc0d4d3e02ff2c4dd89d00199cb32e3482efa
+  metadata.gz: 8eb7ec1d176cfeebf9d5c6e50ab3a45d172e605a
+  data.tar.gz: f4fcde957a37359fdc200e8414c372ad2db2f7a0
 SHA512:
-  metadata.gz: b9461ee53fcb21a3825868b21c3d343b80b54a665652dfcce8a404c3bc8f539ea269453233faf83d24918563108d581742723ab8a7f7affb7db5a2323e19c591
-  data.tar.gz: 77247e2fa8c55d9faa8492d0881622da6023dc040c7c01651d94a1f7da677012b5f16931202ca167c664ac132551d1504560652e9dd73ba38c2917283803fdcb
+  metadata.gz: 8fb557ac7fbec088c63b81242f59ef81cd5ba91d1d8beeb55f6b6f14789026aaf93a58e34faa3cdbfa40e61b1d9bf50c7394bbaf7efca0a669f07e29f351ba4d
+  data.tar.gz: d2116ceda71535205ef6c21bac69945d65531804ec356432302ac112b73189c21d762d4750033e5c0163b8cc1ce790a6cdc2401afbbffa15ad69f5458f9845ad

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Chef Metal Changelog
 
+## 0.9.2 (4/13/2014)
+
+- Timeout stability fixes (makes EC2 a little stabler for some AMIs)
+
 ## 0.9.1 (4/11/2014)
 
 - Make write_file and upload_file create parent directory

data/lib/chef_metal/transport/ssh.rb

@@ -25,34 +25,35 @@ module ChefMetal
         stdout = ''
         stderr = ''
         exitstatus = nil
-        channel = session.open_channel do |channel|
-          # Enable PTY unless otherwise specified, some instances require this
-          unless options[:ssh_pty_enable] == false
-            channel.request_pty do |chan, success|
-               raise "could not get pty" if !success && options[:ssh_pty_enable]
+        session # grab session outside timeout, it has its own timeout
+        with_execute_timeout(execute_options) do
+          channel = session.open_channel do |channel|
+            # Enable PTY unless otherwise specified, some instances require this
+            unless options[:ssh_pty_enable] == false
+              channel.request_pty do |chan, success|
+                 raise "could not get pty" if !success && options[:ssh_pty_enable]
+              end
             end
-          end
 
-          channel.exec("#{options[:prefix]}#{command}") do |ch, success|
-            raise "could not execute command: #{command.inspect}" unless success
+            channel.exec("#{options[:prefix]}#{command}") do |ch, success|
+              raise "could not execute command: #{command.inspect}" unless success
 
-            channel.on_data do |ch2, data|
-              stdout << data
-              stream_chunk(execute_options, data, nil)
-            end
+              channel.on_data do |ch2, data|
+                stdout << data
+                stream_chunk(execute_options, data, nil)
+              end
 
-            channel.on_extended_data do |ch2, type, data|
-              stderr << data
-              stream_chunk(execute_options, nil, data)
-            end
+              channel.on_extended_data do |ch2, type, data|
+                stderr << data
+                stream_chunk(execute_options, nil, data)
+              end
 
-            channel.on_request "exit-status" do |ch, data|
-              exitstatus = data.read_long
+              channel.on_request "exit-status" do |ch, data|
+                exitstatus = data.read_long
+              end
             end
           end
-        end
 
-        with_execute_timeout(execute_options) do
           channel.wait
         end
 
@@ -127,9 +128,10 @@ module ChefMetal
       end
 
       def available?
-        execute('pwd')
+        # If you can't pwd within 10 seconds, you can't pwd
+        execute('pwd', :timeout => 10)
         true
-      rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Net::SSH::HostKeyMismatch
+      rescue Timeout::Error, Errno::ETIMEDOUT, Errno::ECONNREFUSED, Errno::ECONNRESET, Net::SSH::AuthenticationFailed, Net::SSH::Disconnect, Net::SSH::HostKeyMismatch
         Chef::Log.debug("#{username}@#{host} unavailable: could not execute 'pwd' on #{host}: #{$!.inspect}")
         false
       end
@@ -139,7 +141,12 @@ module ChefMetal
       def session
         @session ||= begin
           Chef::Log.debug("Opening SSH connection to #{username}@#{host} with options #{ssh_options.inspect}")
-          Net::SSH.start(host, username, ssh_options)
+          # Small initial connection timeout (10s) to help us fail faster when server is just dead
+          begin
+            Net::SSH.start(host, username, { :timeout => 10 }.merge(ssh_options))
+          rescue Timeout::Error
+            raise InitialConnectTimeout.new($!)
+          end
         end
       end
 
@@ -183,6 +190,15 @@ module ChefMetal
           end
         end
       end
+
+      class InitialConnectTimeout < Timeout::Error
+        def initialize(original_error)
+          super(original_error.message)
+          @original_error = original_error
+        end
+
+        attr_reader :original_error
+      end
     end
   end
 end

data/lib/chef_metal/version.rb

@@ -1,3 +1,3 @@
 module ChefMetal
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-metal
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - John Keiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-12 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: chef-metal-vagrant
   requirement: !ruby/object:Gem::Requirement