moonshot 1.1.0.beta3 → 1.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87a9ec0c99ce38df80d130a365c6c1dc660d5b86
-  data.tar.gz: 2741587ad46b254631dee2819b85a2165c14221f
+  metadata.gz: bcd7bf169cbf27f74b4e6e4f16c59905fb8ed42c
+  data.tar.gz: 5ba58bf877dbbc8e339ef7ff0241633fa1ab5fc2
 SHA512:
-  metadata.gz: 902fc172728fe21adf3dac9bc21ad20a5d861d0a8dee5a3951d9cf88349ea3c99f7fc1dab8504ad2792aea9e243311fa218079c6335a794f374c09e07cc04a5b
-  data.tar.gz: 8df16b96b4dd1e2353fab4bf39b40204a4eef32d1ff81846611a768c0e44c118753282334f98b51ff861df1bb0b6b82298be8379d5d0b5dc1015bed52f0cedf8
+  metadata.gz: 46ed5758422fcad2d667c00936c776fb98f9215e4adfee08595a209bba25101db5414cc0dbcc9b074df1be8693f1ac15abdbb628e59cb1ec8c88b4513f1f7fae
+  data.tar.gz: 1ba2463d5e468c8564d6c07b75b736d4ff69d3454f7ec5a2a260ffcd3f446e83305576e95d8d127c39d6a7a3dc42c21e74dd4e0a21fb71e1c4397422898a6a8f

data/lib/moonshot/tools/asg_rollout.rb

@@ -1,6 +1,6 @@
 module Moonshot
   module Tools
-    class ASGRollout
+    class ASGRollout # rubocop:disable ClassLength
       attr_accessor :config
 
       def initialize(controller:, logical_id:)
@@ -12,9 +12,15 @@ module Moonshot
 
       def run!
         increase_max_and_desired
-        new_instance = wait_for_new_instance
-        wait_for_in_service(new_instance)
-
+        loop do
+          new_instance = wait_for_new_instance
+          begin
+            wait_for_in_service(new_instance)
+          rescue
+            next
+          end
+          break
+        end
         targets = asg.non_conforming_instances
         last_instance = targets.last
 
@@ -34,7 +40,6 @@ module Moonshot
       ensure
         log.start_threaded 'Restoring MaxSize/DesiredCapacity values to normal...' do |s|
           asg.set_max_and_desired(@max, @desired)
-
           s.success 'Restored MaxSize/DesiredCapacity values to normal!'
         end
       end
@@ -44,7 +49,6 @@ module Moonshot
       def increase_max_and_desired
         log.start_threaded 'Increasing MaxSize/DesiredCapacity by 1.' do |s|
           @max, @desired = asg.current_max_and_desired
-
           asg.set_max_and_desired(@max + 1, @desired + 1)
           s.success 'Increased MaxSize/DesiredCapacity by 1.'
         end
@@ -65,10 +69,12 @@ module Moonshot
 
           loop do
             instance_health = asg.instance_health(new_instance)
+            if instance_health.out_of_service?
+              s.failure "Instance #{new_instance.blue} went OutOfService while waiting to join..."
+              raise "Instance #{new_instance.blue} went OutOfService while waiting to join..."
+            end
             break if instance_health.in_service?
-
             s.continue "Instance #{new_instance.blue} is #{instance_health}..."
-
             sleep @config.instance_health_delay
           end
 
@@ -109,9 +115,7 @@ module Moonshot
           loop do
             instance_health = asg.instance_health(instance)
             break if instance_health.out_of_service?
-
             s.continue "Instance #{instance.blue} is #{instance_health}..."
-
             sleep @config.instance_health_delay
           end
 
@@ -128,7 +132,6 @@ module Moonshot
           loop do
             break if @config.terminate_when.call(he)
             sleep @config.terminate_when_delay
-
             if Time.now.to_f - start > timeout
               s.failure "TerminateWhen for #{instance.blue} did not complete in #{timeout} seconds!"
               raise "TerminateWhen for #{instance.blue} did not complete in #{timeout} seconds!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: moonshot
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta3
+  version: 1.1.0.beta4
 platform: ruby
 authors:
 - Cloud Engineering <engineering@acquia.com>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk