hako 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcee254b9d6c4c81d6d480835e3c48ea7c73285b
-  data.tar.gz: 2b8626bbf5480ed279e1872c757f7932f230a842
+  metadata.gz: b73b66a504c37b90e3234870e6333263e7abfc8c
+  data.tar.gz: 1de7e857c4c8f40c275f72bd1822e211521d447b
 SHA512:
-  metadata.gz: 6325c0e207a2e5f89baa61f7a83a19840d5a439097ed6ecaf35e48b5b540b9d8ade04a063ac04a574328b323dd74d9dd2129791d9861757cfbf2ffc696dbaf74
-  data.tar.gz: 202c812931f149fd9db14f58facf35b82c6fc40f896ad13b92125aa95c0f87d243dbd248d9596027cda15d0038bb4aacb903e34cf42c90cd2647d3620033df44
+  metadata.gz: 805980ec90386912e4e69423820f6a224203c52cf06210f67c677c41ecfe181db3285597a6749703e8d73fdff18235352d868d416f182e8e01ca2b85db5d1888
+  data.tar.gz: 01adc0732edc57ebab0304b4f2e95aa4f753038a6ac162def04688f7f8fb57c905948450ac50847b88f12abc190a19452e3b8e68a13a7603610fbb05320bd4fa

data/lib/hako/schedulers/ecs.rb

@@ -17,11 +17,9 @@ module Hako
       def configure(options)
         @cluster = options.fetch('cluster', DEFAULT_CLUSTER)
         @desired_count = options.fetch('desired_count', nil)
-        region = options.fetch('region') { validation_error!('region must be set') }
+        @region = options.fetch('region') { validation_error!('region must be set') }
         @role = options.fetch('role', nil)
-        @ecs = Aws::ECS::Client.new(region: region)
-        @elb = EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: region), options.fetch('elb', nil))
-        @ec2 = Aws::EC2::Client.new(region: region)
+        @ecs_elb_options = options.fetch('elb', nil)
         @started_at = nil
         @container_instance_arn = nil
       end
@@ -44,7 +42,7 @@ module Hako
           task_definition = register_task_definition(definitions)
           if task_definition == :noop
             Hako.logger.info "Task definition isn't changed"
-            task_definition = @ecs.describe_task_definition(task_definition: @app_id).task_definition
+            task_definition = ecs_client.describe_task_definition(task_definition: @app_id).task_definition
           else
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
           end
@@ -82,7 +80,7 @@ module Hako
           task_definition = register_task_definition_for_oneshot(definitions)
           if task_definition == :noop
             Hako.logger.info "Task definition isn't changed"
-            task_definition = @ecs.describe_task_definition(task_definition: "#{@app_id}-oneshot").task_definition
+            task_definition = ecs_client.describe_task_definition(task_definition: "#{@app_id}-oneshot").task_definition
           else
             Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
           end
@@ -97,7 +95,7 @@ module Hako
       def stop_oneshot
         if @task
           Hako.logger.warn "Stopping #{@task.task_arn}"
-          @ecs.stop_task(cluster: @cluster, task: @task.task_arn, reason: 'Stopped by hako stop_oneshot')
+          ecs_client.stop_task(cluster: @cluster, task: @task.task_arn, reason: 'Stopped by hako stop_oneshot')
           wait_for_oneshot_finish
         end
       end
@@ -112,7 +110,7 @@ module Hako
 
         unless service.load_balancers.empty?
           lb = service.load_balancers[0]
-          lb_detail = @elb.describe_load_balancer
+          lb_detail = ecs_elb_client.describe_load_balancer
           puts 'Load balancer:'
           lb_detail.listener_descriptions.each do |ld|
             l = ld.listener
@@ -127,15 +125,15 @@ module Hako
         end
 
         puts 'Tasks:'
-        @ecs.list_tasks(cluster: @cluster, service_name: service.service_arn).each do |page|
+        ecs_client.list_tasks(cluster: @cluster, service_name: service.service_arn).each do |page|
           unless page.task_arns.empty?
-            tasks = @ecs.describe_tasks(cluster: @cluster, tasks: page.task_arns).tasks
+            tasks = ecs_client.describe_tasks(cluster: @cluster, tasks: page.task_arns).tasks
             container_instances = {}
-            @ecs.describe_container_instances(cluster: @cluster, container_instances: tasks.map(&:container_instance_arn)).container_instances.each do |ci|
+            ecs_client.describe_container_instances(cluster: @cluster, container_instances: tasks.map(&:container_instance_arn)).container_instances.each do |ci|
               container_instances[ci.container_instance_arn] = ci
             end
             ec2_instances = {}
-            @ec2.describe_instances(instance_ids: container_instances.values.map(&:ec2_instance_id)).reservations.each do |r|
+            ec2_client.describe_instances(instance_ids: container_instances.values.map(&:ec2_instance_id)).reservations.each do |r|
               r.instances.each do |i|
                 ec2_instances[i.instance_id] = i
               end
@@ -165,20 +163,35 @@ module Hako
       def remove
         service = describe_service
         if service
-          @ecs.delete_service(cluster: @cluster, service: @app_id)
+          ecs_client.delete_service(cluster: @cluster, service: @app_id)
           Hako.logger.info "#{service.service_arn} is deleted"
         else
           puts "Service #{@app_id} doesn't exist"
         end
 
-        @elb.destroy
+        ecs_elb_client.destroy
       end
 
       private
 
+      # @return [Aws::ECS::Client]
+      def ecs_client
+        @ecs_client ||= Aws::ECS::Client.new(region: @region)
+      end
+
+      # @return [Aws::EC2::Client]
+      def ec2_client
+        @ec2_client ||= Aws::EC2::Client.new(region: @region)
+      end
+
+      # @return [EcsElb]
+      def ecs_elb_client
+        @ecs_elb_client ||= EcsElb.new(@app_id, Aws::ElasticLoadBalancing::Client.new(region: @region), @ecs_elb_options)
+      end
+
       # @return [Aws::ECS::Types::Service, nil]
       def describe_service
-        service = @ecs.describe_services(cluster: @cluster, services: [@app_id]).services[0]
+        service = ecs_client.describe_services(cluster: @cluster, services: [@app_id]).services[0]
         if service && service.status != 'INACTIVE'
           service
         end
@@ -200,9 +213,9 @@ module Hako
       # @return [Fixnum]
       def new_front_port
         max_port = -1
-        @ecs.list_services(cluster: @cluster).each do |page|
+        ecs_client.list_services(cluster: @cluster).each do |page|
           unless page.service_arns.empty?
-            @ecs.describe_services(cluster: @cluster, services: page.service_arns).services.each do |s|
+            ecs_client.describe_services(cluster: @cluster, services: page.service_arns).services.each do |s|
               if s.status != 'INACTIVE'
                 port = find_front_port(s)
                 if port
@@ -222,7 +235,7 @@ module Hako
       # @param [Aws::ECS::Types::Service] service
       # @return [Fixnum, nil]
       def find_front_port(service)
-        task_definition = @ecs.describe_task_definition(task_definition: service.task_definition).task_definition
+        task_definition = ecs_client.describe_task_definition(task_definition: service.task_definition).task_definition
         container_definitions = {}
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
@@ -239,7 +252,7 @@ module Hako
         if @force
           return true
         end
-        task_definition = @ecs.describe_task_definition(task_definition: family).task_definition
+        task_definition = ecs_client.describe_task_definition(task_definition: family).task_definition
         container_definitions = {}
         task_definition.container_definitions.each do |c|
           container_definitions[c.name] = c
@@ -287,7 +300,7 @@ module Hako
       # @return [Aws::ECS::Types::TaskDefinition, Symbol]
       def register_task_definition(definitions)
         if task_definition_changed?(@app_id, definitions)
-          @ecs.register_task_definition(
+          ecs_client.register_task_definition(
             family: @app_id,
             container_definitions: definitions,
             volumes: volumes_definition,
@@ -310,7 +323,7 @@ module Hako
       def register_task_definition_for_oneshot(definitions)
         family = "#{@app_id}-oneshot"
         if task_definition_changed?(family, definitions)
-          @ecs.register_task_definition(
+          ecs_client.register_task_definition(
             family: "#{@app_id}-oneshot",
             container_definitions: definitions,
             volumes: volumes_definition,
@@ -355,7 +368,7 @@ module Hako
       # @return [Aws::ECS::Types::Task]
       def run_task(task_definition, commands, env)
         environment = env.map { |k, v| { name: k, value: v } }
-        @ecs.run_task(
+        ecs_client.run_task(
           cluster: @cluster,
           task_definition: task_definition.task_definition_arn,
           overrides: {
@@ -396,7 +409,7 @@ module Hako
       def wait_for_task(task)
         task_arn = task.task_arn
         loop do
-          task = @ecs.describe_tasks(cluster: @cluster, tasks: [task_arn]).tasks[0]
+          task = ecs_client.describe_tasks(cluster: @cluster, tasks: [task_arn]).tasks[0]
           if task.nil?
             Hako.logger.debug "Task #{task_arn} could not be described"
             sleep 1
@@ -431,8 +444,8 @@ module Hako
       # @param [String] container_instance_arn
       # @return [nil]
       def report_container_instance(container_instance_arn)
-        container_instance = @ecs.describe_container_instances(cluster: @cluster, container_instances: [container_instance_arn]).container_instances[0]
-        @ec2.describe_tags(filters: [{ name: 'resource-id', values: [container_instance.ec2_instance_id] }]).each do |page|
+        container_instance = ecs_client.describe_container_instances(cluster: @cluster, container_instances: [container_instance_arn]).container_instances[0]
+        ec2_client.describe_tags(filters: [{ name: 'resource-id', values: [container_instance.ec2_instance_id] }]).each do |page|
           tag = page.tags.find { |t| t.key == 'Name' }
           if tag
             Hako.logger.info "Container instance is #{container_instance_arn} (#{tag.value} #{container_instance.ec2_instance_id})"
@@ -455,7 +468,7 @@ module Hako
             desired_count: @desired_count,
             role: @role,
           }
-          name = @elb.find_or_create_load_balancer(front_port)
+          name = ecs_elb_client.find_or_create_load_balancer(front_port)
           if name
             params[:load_balancers] = [
               {
@@ -465,7 +478,7 @@ module Hako
               },
             ]
           end
-          @ecs.create_service(params).service
+          ecs_client.create_service(params).service
         else
           params = {
             cluster: @cluster,
@@ -474,7 +487,7 @@ module Hako
             task_definition: task_definition_arn,
           }
           if service_changed?(service, params)
-            @ecs.update_service(params).service
+            ecs_client.update_service(params).service
           else
             :noop
           end
@@ -501,7 +514,7 @@ module Hako
         latest_event_id = find_latest_event_id(service.events)
         Hako.logger.debug "  latest_event_id=#{latest_event_id}"
         loop do
-          s = @ecs.describe_services(cluster: service.cluster_arn, services: [service.service_arn]).services[0]
+          s = ecs_client.describe_services(cluster: service.cluster_arn, services: [service.service_arn]).services[0]
           s.events.each do |e|
             if e.id == latest_event_id
               break
@@ -509,9 +522,11 @@ module Hako
             Hako.logger.info "#{e.created_at}: #{e.message}"
           end
           latest_event_id = find_latest_event_id(s.events)
-          finished = s.deployments.all? { |d| d.status != 'ACTIVE' }
-          Hako.logger.debug "  latest_event_id=#{latest_event_id}, deployment statuses=#{s.deployments.map(&:status)}"
-          if finished
+          Hako.logger.debug "  latest_event_id=#{latest_event_id}, deployments=#{s.deployments}"
+          no_active = s.deployments.all? { |d| d.status != 'ACTIVE' }
+          primary = s.deployments.find { |d| d.status == 'PRIMARY' }
+          primary_ready = primary && primary.running_count == primary.desired_count
+          if no_active && primary_ready
             return
           else
             sleep 1

data/lib/hako/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk