hako 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0c20cd9f0e6cd36eec79e0d44be24027970b626
-  data.tar.gz: 5061cd6b796075c6a0d6b84d771fa2b910613c28
+  metadata.gz: 45f04940c4d0ff4ff960ea9619a525085aba342d
+  data.tar.gz: 67610aa17c6877ed84599ecd1be143c4c39d6a03
 SHA512:
-  metadata.gz: d3b1e35d43f959e0ab45392f5839932c8a41fc38c40f8da30a966e3c72ff7c6dc7755fd8ebb6b6375205038298f0cf926a666f84e53a40568db85cc41cfea08d
-  data.tar.gz: 6f14e53cadfdf897764527ec016454cfc0ac444f9d06c77fa70af4cf374f1920ce2c4a7455c31c732a963894b093e114d1872ac1a7bac58afb83ce42d3a20b8c
+  metadata.gz: 92407332bca376bcba4e54248842d685568410cf92c4cb19aa7be30d1353a266e549db55da77b3f12c1cc7b5161a78de6edc0e0fc33a2f322822bb937870dbd2
+  data.tar.gz: 2599f5133827e410fb4cc2d068fe7fc09e52b654022f140549ab34abc620cade3bc111dae8c8bb861ec60c89768dc9e6e57eb13b89b8dc929dc50e8a0746d7e9

data/.rubocop.yml

@@ -37,5 +37,8 @@ Style/TrailingCommaInArguments:
 Style/TrailingCommaInLiteral:
   Enabled: false
 
+Style/PredicateName:
+  Enabled: false
+
 Performance/RedundantBlockCall:
   Enabled: false

data/examples/hello-autoscaling-group.yml

@@ -0,0 +1,14 @@
+scheduler:
+  type: ecs
+  region: ap-northeast-1
+  cluster: eagletmt
+  role: ecsServiceRole
+  autoscaling_group_for_oneshot: hako-batch-cluster
+app:
+  image: ryotarai/hello-sinatra
+  memory: 128
+  cpu: 256
+  env:
+    PORT: 3000
+    MESSAGE: 'hello'
+  command: ['echo', 'heavy offline job']

data/lib/hako/env_expander.rb

@@ -43,7 +43,7 @@ module Hako
         end
       end
       unless variables.empty?
-        raise ExpansionError.new("Unresolvable variables: #{variables.to_a}")
+        raise ExpansionError.new("Could not resolve embedded variables from $providers=#{@providers}: #{variables.to_a}")
       end
 
       expanded_env = {}

data/lib/hako/schedulers/ecs.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require 'aws-sdk'
 require 'hako'
+require 'hako/error'
 require 'hako/scheduler'
 require 'hako/schedulers/ecs_definition_comparator'
 require 'hako/schedulers/ecs_elb'
@@ -9,6 +10,9 @@ require 'hako/schedulers/ecs_autoscaling'
 module Hako
   module Schedulers
     class Ecs < Scheduler
+      class NoTasksStarted < Error
+      end
+
       DEFAULT_CLUSTER = 'default'
       DEFAULT_FRONT_PORT = 10000
 
@@ -27,6 +31,7 @@ module Hako
         end
         @started_at = nil
         @container_instance_arn = nil
+        @autoscaling_group_for_oneshot = options.fetch('autoscaling_group_for_oneshot', nil)
       end
 
       # @param [Hash<String, Container>] containers
@@ -450,9 +455,21 @@ module Hako
           Hako.logger.error("#{failure.arn} #{failure.reason}")
         end
         if result.tasks.empty?
-          raise 'No tasks started'
+          raise NoTasksStarted.new('No tasks started')
         end
         result.tasks[0]
+      rescue Aws::ECS::Errors::InvalidParameterException => e
+        if e.message == 'No Container Instances were found in your cluster.' && on_no_tasks_started(task_definition)
+          retry
+        else
+          raise e
+        end
+      rescue NoTasksStarted => e
+        if on_no_tasks_started(task_definition)
+          retry
+        else
+          raise e
+        end
       end
 
       # @return [Fixnum]
@@ -643,6 +660,64 @@ module Hako
 
         raise "Unable to find rollback target. #{task_definition.task_definition_arn} is INACTIVE?"
       end
+
+      # @param [Aws::ECS::Types::TaskDefinition] task_definition
+      # @return [Boolean] true if the capacity is reserved
+      def on_no_tasks_started(task_definition)
+        unless @autoscaling_group_for_oneshot
+          return false
+        end
+
+        autoscaling = Aws::AutoScaling::Client.new
+        loop do
+          asg = autoscaling.describe_auto_scaling_groups(auto_scaling_group_names: [@autoscaling_group_for_oneshot]).auto_scaling_groups[0]
+          unless asg
+            raise Error.new("AutoScaling Group '#{@autoscaling_group_for_oneshot}' does not exist")
+          end
+
+          container_instances = ecs_client.list_container_instances(cluster: @cluster).flat_map { |c| ecs_client.describe_container_instances(cluster: @cluster, container_instances: c.container_instance_arns).container_instances }
+          if has_capacity?(task_definition, container_instances)
+            Hako.logger.info("There's remaining capacity. Start retrying...")
+            return true
+          end
+
+          # Check autoscaling group health
+          current = asg.instances.count { |i| i.lifecycle_state == 'InService' }
+          if asg.desired_capacity != current
+            Hako.logger.debug("#{asg.auto_scaling_group_name} isn't in desired state. desired_capacity=#{asg.desired_capacity} in-service instances=#{current}")
+            sleep 1
+            next
+          end
+
+          # Check out-of-service instances
+          out_instances = asg.instances.map(&:instance_id)
+          container_instances.each do |ci|
+            out_instances.delete(ci.ec2_instance_id)
+          end
+          unless out_instances.empty?
+            Hako.logger.debug("There's instances that is running but not registered as container instances: #{out_instances}")
+            sleep 1
+            next
+          end
+
+          # Scale out
+          desired = current + 1
+          Hako.logger.info("Increment desired_capacity of #{asg.auto_scaling_group_name} from #{current} to #{desired}")
+          autoscaling.set_desired_capacity(auto_scaling_group_name: asg.auto_scaling_group_name, desired_capacity: desired)
+        end
+      end
+
+      # @param [Aws::ECS::Types::TaskDefinition] task_definition
+      # @param [Array<Aws::ECS::Types::ContainerInstance>] container_instances
+      # @return [Boolean]
+      def has_capacity?(task_definition, container_instances)
+        required_cpu, required_memory = task_definition.container_definitions.inject([0, 0]) { |(cpu, memory), d| [cpu + d.cpu, memory + d.memory] }
+        container_instances.any? do |ci|
+          cpu = ci.remaining_resources.find { |r| r.name == 'CPU' }.integer_value
+          memory = ci.remaining_resources.find { |r| r.name == 'MEMORY' }.integer_value
+          required_cpu < cpu && required_memory < memory
+        end
+      end
     end
   end
 end

data/lib/hako/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hako
-  VERSION = '0.18.1'
+  VERSION = '0.19.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-02 00:00:00.000000000 Z
+date: 2016-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -114,6 +114,7 @@ files:
 - bin/console
 - bin/setup
 - examples/front.yml
+- examples/hello-autoscaling-group.yml
 - examples/hello-autoscaling.yml
 - examples/hello-lb.yml
 - examples/hello.env