zergrush_cf 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTM3MzQxNjFkMjI0M2VmZDdjMjA0ZTc2ODI5YjMwYzZkYzc0NjUzMA==
+    ZTkyNGMzNzAzMzM0MzVmYzA3ZDJkNDY2ZmQ5ZDZhMDZjNDlhMjFjZA==
   data.tar.gz: !binary |-
-    MzE3MjVmZmYzZDlmYzc3ODQ0NTk2YTY5MGU4NWE5MGYwZDkzYzFmMA==
+    NmQxMjRhNjAzMWI2MzgyYjM2YjgxZTY5OTQxMzcyNDViMTRkYzA3ZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWQ3OGJjZGNiZmRhZGZjNDRmNTRmNmQ2ZmNhNzI3MGNlNDAzNTQ4ZGFjM2M4
-    ZGQyZjhlYWZjODVlODQ5ODRmNjQ0YzJiMTYwNDFkM2FjN2I0OWZiYzFhMWJh
-    YTFmMzU5Zjg1NjRkNTQwYzU4OWYyYTQ4M2VhMTlkZTRkNzNhNjM=
+    MjQ1MGMwOWQ5ZTExMDAwMGQ5NTI1MzYwNjI4YWNlYzg3N2FkYmFmNGEyYmI4
+    YjM5ODQzNGE1ZGJjNGYyNzNlYWQyZTI3ZDQ3MWIwYWUxZmI2NDc0ZDI3MTk0
+    OGQ4NzEzZTQzODYwNDA4NjE0ZWQxMzkyNGE4MTczNWJjNGJkMTc=
   data.tar.gz: !binary |-
-    YTM1ZDhiNTE4MjEzYWFjNjkxMzVlYTIwZmFiOTNmYWFiMzAyMDliODZhNjhi
-    OTZlNzVmZjg5MGM3MzM5M2NlMjVkNWQ3YzhiNTFmODVlYzQ5NDg2NzRmNTA2
-    ZWQ0M2E1ZDQwZThjYzYzZTA1ODY4NjMyMTFiOWFlZDVkMjlkMmU=
+    MDlmMDNkYzNlMDk2ZWFiZThlNWU0M2E2Y2QyNTZkYTQ1ZGZmNzYyNmU5YTcx
+    ZjYwODQ4OTc5NTk2ZmRiZWI5ODg0ZjA1N2RkYTc3MWMxMjFjZDA3MDQ3YWM4
+    OTA0MTc5YjM3MmM5OGUwMGViY2M1YTM4YTY2MWJmMTcwZTgxYjc=

data/lib/zergrush_cf/init.rb

@@ -29,6 +29,7 @@ require 'awesome_print'
 require 'securerandom'
 require 'bunny'
 require 'time'
+require 'retries'
 require_relative 'renderer'
 
 class CloudFormation < ZergGemPlugin::Plugin "/driver"
@@ -85,6 +86,10 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             end
         end
 
+        Excon.defaults[:connect_timeout] = 600
+        Excon.defaults[:read_timeout] = 600
+        Excon.defaults[:write_timeout] = 600
+
         cf = Fog::AWS::CloudFormation.new(
             :aws_access_key_id => aws_key_id,
             :aws_secret_access_key => aws_secret,
@@ -112,10 +117,15 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
         end
 
-        events = cf.describe_stack_events(stack_name).body['StackEvents']
-        while events == nil do
-            sleep 1 
+        events = nil
+        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
             events = cf.describe_stack_events(stack_name).body['StackEvents']
+        }
+        while events == nil do
+            sleep 3
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
+                events = cf.describe_stack_events(stack_name).body['StackEvents']
+            }
         end
 
         event_counter = 0
@@ -124,7 +134,9 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
             event_counter = events.length
 
-            events = cf.describe_stack_events(stack_name).body['StackEvents']
+            with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
+                events = cf.describe_stack_events(stack_name).body['StackEvents']
+            }
             outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             if outputs_info.body["Stacks"][0]["StackStatus"] == "CREATE_COMPLETE"
                 logEvents(events.first(events.length - event_counter))
@@ -172,6 +184,10 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         # run fog cleanup on the stack.
         stack_name = "#{task_name}"
 
+        Excon.defaults[:connect_timeout] = 600
+        Excon.defaults[:read_timeout] = 600
+        Excon.defaults[:write_timeout] = 600
+        
         cf = Fog::AWS::CloudFormation.new(
             :aws_access_key_id => aws_key_id,
             :aws_secret_access_key => aws_secret,
@@ -196,11 +212,16 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             end
         end
 
-        events = cf.describe_stack_events(stack_name).body['StackEvents']
+        events = nil
+        with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
+            events = cf.describe_stack_events(stack_name).body['StackEvents']
+        }
         while events == nil do
-            sleep 1
+            sleep 3
             begin
-                events = cf.describe_stack_events(stack_name).body['StackEvents']
+                with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
+                    events = cf.describe_stack_events(stack_name).body['StackEvents']
+                }
             rescue Fog::AWS::CloudFormation::NotFound
                 rabbit_objects[:connection].close unless rabbit_objects == nil
                 return 0
@@ -214,7 +235,9 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
 
             event_counter = events.length
             begin
-                events = cf.describe_stack_events(stack_name).body['StackEvents']
+                with_retries(:max_tries => 10, :base_sleep_seconds => 3, :max_sleep_seconds => 20, :rescue => Fog::AWS::CloudFormation::Error) {
+                    events = cf.describe_stack_events(stack_name).body['StackEvents']
+                }
                 outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             rescue Fog::AWS::CloudFormation::NotFound
                 logEvents(events.first(events.length - event_counter))

data/lib/zergrush_cf/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushCF
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/zergrush_cf.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "zergrush", ">= 0.0.16"
+  s.add_development_dependency "zergrush", ">= 0.0.17"
 
   s.add_dependency "fog", ">=1.20.0"
   s.add_dependency "bunny", ">=1.2.1"
+  s.add_dependency "retries", ">=0.0.5"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_cf
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.16
+        version: 0.0.17
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
+- !ruby/object:Gem::Dependency
+  name: retries
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: Amazon Cloud Formation driver for zergrush
 email:
 - Marat.Garafutdinov@mtnsat.com