ironfan 4.9.1 → 4.9.2

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v4.9.2
+* Ec2::Machine: trying a more brute-force solution to 'server went away' bug
+
 # v4.9.1
 * adding missed rbvmomi dependency
 

data/VERSION

@@ -1 +1 @@
-4.9.1
+4.9.2

data/ironfan.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ironfan"
-  s.version = "4.9.1"
+  s.version = "4.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Infochimps"]
-  s.date = "2013-04-09"
+  s.date = "2013-04-15"
   s.description = "Ironfan allows you to orchestrate not just systems but clusters of machines. It includes a powerful layer on top of knife and a collection of cloud cookbooks."
   s.email = "coders@infochimps.com"
   s.extra_rdoc_files = [

data/lib/ironfan/provider/ec2/machine.rb

@@ -170,13 +170,19 @@ module Ironfan
             computer.machine = machine
             remember machine, :id => computer.name
 
-            # AWS sometimes takes too long to respond for this block's liking.
-            #   Expand its wait interval, so that it doesn't just bomb out
-            #   after three quick failures in succession.
-            # For more info, see:
-            # - http://rubydoc.info/gems/fog/1.9.0/Fog/Model#wait_for-instance_method
-            # - https://github.com/fog/fog/blob/master/lib/fog/core/wait_for.rb
-            fog_server.wait_for(Fog.timeout, 5) { ready? }
+            # Trying a more brute force "I tell you 3 times", to get around
+            #   https://github.com/infochimps-labs/ironfan/issues/271
+            begin
+              fog_server.wait_for { ready? }
+            rescue Fog::Errors::Error => e
+              try ||= 0
+              raise if try > 3
+              try += 1
+              pause_for = 3 * try
+              ui.info "Rescue ##{try} for #{e}, sleeping #{pause_for} seconds"
+              sleep pause_for
+              retry
+            end
           end
 
           # tag the computer correctly

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ironfan
 version: !ruby/object:Gem::Version
-  version: 4.9.1
+  version: 4.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -359,7 +359,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2375484175096244469
+      hash: -1939807353001774463
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: