ecs-easy-cluster 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637c62d07ff46b73c2fb3a6c56dbc6bdde20bb64
-  data.tar.gz: 6ade21bcd624fa7a08439fc51a53865e207bcb5c
+  metadata.gz: a16a8b4f530e203e99ec31aa3c2b4f55e18cc42b
+  data.tar.gz: 6cc1b2c1c06e6a39912206544ca2dc95eb40e0ba
 SHA512:
-  metadata.gz: 5951dd1af32d8c4aea7bf55911080eb120d0622e36d30061f4cd0823fe1417605a113752aee29ecfab5e079699704980325e3649f46ed55f541717dd6e4f598a
-  data.tar.gz: 9f053297c904201d384541c22e72cb694f781d81d4eefbceaccdb2afeb6fab1ac4431a78dbab0e4f3fe594c5edfc4727cb95b73ec8997a753571743794280432
+  metadata.gz: cb4d9383c09a413fa137e32a878dbff86a6352a3243da85d0d5bbeb24033633aaeb0478c38f507d728ee1f2a85baa307192d72d239263e9f7b70dff300fda378
+  data.tar.gz: a2c89af6d47072ef66aa8d9742a7bf9727d45cb5187bfa63a104572015ab1839c4280f4044121eb8b3d52726f0b60d8df8678e966bd68f7f16df07dbd9c65d89

data/lib/ecs/easy/cluster/base.rb

@@ -156,13 +156,5 @@ module Ecs::Easy::Cluster
       puts e
     end
 
-    private
-      def fail_reason( failures )
-        reasons = failures.map {|f| f.reason }
-        if reasons.include?( "RESOURCE:MEMORY" )
-          return "RESOURCE:MEMORY"
-        end
-      end
-
   end
 end

data/lib/ecs/easy/cluster/mem_scale.rb

@@ -1,6 +1,27 @@
 module Ecs::Easy::Cluster
   class MemScale < Base 
 
+    class CannotStartTaskError < StandardError
+      attr_reader :result
+      def initialize( result )
+        @result = result
+      end
+
+      def failures
+        return nil unless result
+        result.failures
+      end
+
+      def fail_reason
+        return nil if failures.empty?
+        reasons = failures.map {|f| f.reason }
+        if reasons.include?( "RESOURCE:MEMORY" )
+          return "RESOURCE:MEMORY"
+        end
+        nil
+      end
+    end
+
     EC2_PROFILE_PATH = File.expand_path("../config/ec2_profile.json", __FILE__)
     INSTANCE_TYPES = JSON.parse(File.read( EC2_PROFILE_PATH ))
 
@@ -11,33 +32,37 @@ module Ecs::Easy::Cluster
         end
       end
 
-      res = nil
-      3.times do
+      retry_count = 3
+      begin
         wait_until_ready
         res = run_task!( task_definition, overrides )
-        break if res.failures.empty?
-        puts "Failed to run the task. Try again."
-        sleep 5
-      end
-
-      # Failure because some reasons
-      unless res.failures.empty?
-        puts res.failures
-        case fail_reason(res.failures)
+        unless res.failures.empty?
+          raise CannotStartTaskError.new( res )
+        end
+      rescue CannotStartTaskError => e
+        puts e.failures
+        case e.fail_reason
         when "RESOURCE:MEMORY"
           puts "No enough memory on current container instances to execute this task. Add another container instance automatically."
 
           if num_instances >= max_instances
-            raise "Could\'t scale more instances because it reaches maximum instances. You should upgrade the maximum number of instance to execute multiple tasks at the same time."
+            puts "Couldn\'t scale more instances because it reaches maximum instances. You should upgrade the maximum number of instance to execute multiple tasks at the same time."
           end
           unless acceptable_task?( task_definition )
-            raise "Could\'t accept this task because of the lack of memory. You should upgrade ec2 instance type."
+            raise "Couldn\'t accept this task because of the lack of memory. You should upgrade ec2 instance type."
           end
 
           scale!
         else
-          raise "Unknown reason: #{res.failures}"
+          raise "Unknown reason: #{e.failures}"
         end
+
+        puts "Failed to run the task. Try again."
+        sleep 10
+        retry_count -= 1
+        retry if retry_count > 0
+      rescue => e
+        raise "Unknown reason: #{e}"
       end
 
       res

data/lib/ecs/easy/cluster/version.rb

@@ -1,7 +1,7 @@
 module Ecs
   module Easy
     module Cluster
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs-easy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - metheglin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk