hako 0.22.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7e905ba26a5f96fbc2aa0e452d7802a6253b293
-  data.tar.gz: eb043950033d3d9367cbfcc57704238fd9a0f645
+  metadata.gz: 23c0c6350f347bcf8bc3a4462c6284e2d3135f22
+  data.tar.gz: 9ddd98e7ce10875ac654fcc2c425de3264d392e4
 SHA512:
-  metadata.gz: 2b259b71edbdfe3fa4e29894cfcb3d70a4cbbb316943701a511083a065d172398bd29846e1b06d437c315c81a56328631598894bee4abfbfccdf20a4036d544f
-  data.tar.gz: 8b7d739da8bbefb071376e82fec854b96e1b093bf4b24acdec4289e1e364a72c5a666467f8917cf886752be77b28bd7988301889d3cc28441cf40c6bb58f82fe
+  metadata.gz: 1597dd9361d1ec0fbee733dc89f18a1856a0c49527a0b5b55a5982c31520c9d9483ba42fcbb36df9dbf3a81789d32c2336cf3e0f38dd7bf4c670b39dc7582821
+  data.tar.gz: a0dba22ad43958e5092b3a130fcb5a53d01328418feec37d57edbeef41b95f2350fe8577e1789d30c6a58dcfda8bdedc0a23de0ea66b0525a5f898763c22becc

data/lib/hako/cli.rb

@@ -65,14 +65,17 @@ module Hako
           Hako.logger.level = Logger::DEBUG
         end
 
-        Commander.new(Application.new(@yaml_path)).deploy(force: @force, tag: @tag, dry_run: @dry_run)
+        Commander.new(Application.new(@yaml_path)).deploy(force: @force, tag: @tag, dry_run: @dry_run, timeout: @timeout)
       end
 
+      DEFAULT_TIMEOUT = 1200 # 20 minutes
+
       def parse!(argv)
         @force = false
         @tag = 'latest'
         @dry_run = false
         @verbose = false
+        @timeout = DEFAULT_TIMEOUT
         parser.parse!(argv)
         @yaml_path = argv.first
 
@@ -90,6 +93,7 @@ module Hako
           opts.on('-t', '--tag=TAG', 'Specify tag (default: latest)') { |v| @tag = v }
           opts.on('-n', '--dry-run', 'Enable dry-run mode') { @dry_run = true }
           opts.on('-v', '--verbose', 'Enable verbose logging') { @verbose = true }
+          opts.on('--timeout=TIMEOUT_SEC', "Timeout deployment after TIMEOUT_SEC seconds (default: #{DEFAULT_TIMEOUT})") { |v| @timeout = v.to_i }
         end
       end
     end

data/lib/hako/commander.rb

@@ -17,11 +17,11 @@ module Hako
     # @param [String] tag
     # @param [Boolean] dry_run
     # @return [nil]
-    def deploy(force: false, tag: 'latest', dry_run: false)
+    def deploy(force: false, tag: 'latest', dry_run: false, timeout:)
       containers = load_containers(tag, dry_run: dry_run)
       scripts = @app.yaml.fetch('scripts', []).map { |config| load_script(config, dry_run: dry_run) }
       volumes = @app.yaml.fetch('volumes', [])
-      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, volumes: volumes, force: force, dry_run: dry_run)
+      scheduler = load_scheduler(@app.yaml['scheduler'], scripts, volumes: volumes, force: force, dry_run: dry_run, timeout: timeout)
 
       scripts.each { |script| script.deploy_starting(containers) }
       scheduler.deploy(containers)
@@ -118,9 +118,10 @@ module Hako
     # @param [Hash] volumes
     # @param [Boolean] force
     # @param [Boolean] dry_run
+    # @param [Integer] timeout
     # @return [Scheduler]
-    def load_scheduler(yaml, scripts, volumes: [], force: false, dry_run:)
-      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run)
+    def load_scheduler(yaml, scripts, volumes: [], force: false, dry_run:, timeout: nil)
+      Loader.new(Hako::Schedulers, 'hako/schedulers').load(yaml.fetch('type')).new(@app.id, yaml, volumes: volumes, scripts: scripts, force: force, dry_run: dry_run, timeout: timeout)
     end
 
     # @param [Hash] yaml

data/lib/hako/scheduler.rb

@@ -12,12 +12,14 @@ module Hako
     # @param [Array<Script>] scripts
     # @param [Boolean] dry_run
     # @param [Boolean] force
-    def initialize(app_id, options, volumes:, scripts:, dry_run:, force:)
+    # @param [Integer] timeout in seconds
+    def initialize(app_id, options, volumes:, scripts:, dry_run:, force:, timeout:)
       @app_id = app_id
       @volumes = volumes
       @scripts = scripts
       @dry_run = dry_run
       @force = force
+      @timeout = timeout
       configure(options)
     end
 

data/lib/hako/schedulers/ecs.rb

@@ -64,25 +64,38 @@ module Hako
             @autoscaling.apply(Aws::ECS::Types::Service.new(cluster_arn: @cluster, service_name: @app_id))
           end
         else
+          current_service = describe_service
           task_definition = register_task_definition(definitions)
-          if task_definition == :noop
+          task_definition_changed = task_definition != :noop
+          if task_definition_changed
+            Hako.logger.info "Registered task definition: #{task_definition.task_definition_arn}"
+          else
             Hako.logger.info "Task definition isn't changed"
             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
-          service = create_or_update_service(task_definition.task_definition_arn, front_port)
+          unless current_service
+            current_service = create_initial_service(task_definition.task_definition_arn, front_port)
+          end
+          service = update_service(current_service, task_definition.task_definition_arn)
           if service == :noop
             Hako.logger.info "Service isn't changed"
             if @autoscaling
-              @autoscaling.apply(describe_service)
+              @autoscaling.apply(current_service)
             end
           else
             Hako.logger.info "Updated service: #{service.service_arn}"
             if @autoscaling
               @autoscaling.apply(service)
             end
-            wait_for_ready(service)
+            unless wait_for_ready(service)
+              if task_definition_changed
+                Hako.logger.error("Rolling back to #{current_service.task_definition}")
+                update_service(service, current_service.task_definition)
+                ecs_client.deregister_task_definition(task_definition: service.task_definition)
+                Hako.logger.debug "Deregistered #{service.task_definition}"
+              end
+              raise Error.new('Deployment cancelled')
+            end
           end
           Hako.logger.info 'Deployment completed'
         end
@@ -569,44 +582,46 @@ module Hako
         Hako.logger.info "Container instance is #{container_instance_arn} (#{container_instance.ec2_instance_id})"
       end
 
+      # @param [Aws::ECS::Types::Service] task_definition_arn
       # @param [String] task_definition_arn
-      # @param [Fixnum] front_port
       # @return [Aws::ECS::Types::Service, Symbol]
-      def create_or_update_service(task_definition_arn, front_port)
-        service = describe_service
-        if service.nil?
-          params = {
-            cluster: @cluster,
-            service_name: @app_id,
-            task_definition: task_definition_arn,
-            desired_count: @desired_count,
-            role: @role,
-            deployment_configuration: @deployment_configuration,
-          }
-          if ecs_elb_client.find_or_create_load_balancer(front_port)
-            params[:load_balancers] = [
-              @ecs_elb_client.load_balancer_params_for_service.merge(container_name: 'front', container_port: 80),
-            ]
-          end
-          ecs_client.create_service(params).service
+      def update_service(current_service, task_definition_arn)
+        params = {
+          cluster: @cluster,
+          service: @app_id,
+          desired_count: @desired_count,
+          task_definition: task_definition_arn,
+          deployment_configuration: @deployment_configuration,
+        }
+        if @autoscaling
+          # Keep current desired_count if autoscaling is enabled
+          params[:desired_count] = current_service.desired_count
+        end
+        if service_changed?(current_service, params)
+          ecs_client.update_service(params).service
         else
-          params = {
-            cluster: @cluster,
-            service: @app_id,
-            desired_count: @desired_count,
-            task_definition: task_definition_arn,
-            deployment_configuration: @deployment_configuration,
-          }
-          if @autoscaling
-            # Keep current desired_count if autoscaling is enabled
-            params[:desired_count] = service.desired_count
-          end
-          if service_changed?(service, params)
-            ecs_client.update_service(params).service
-          else
-            :noop
-          end
+          :noop
+        end
+      end
+
+      # @param [String] task_definition_arn
+      # @param [Fixnum] front_port
+      # @return [Aws::ECS::Types::Service]
+      def create_initial_service(task_definition_arn, front_port)
+        params = {
+          cluster: @cluster,
+          service_name: @app_id,
+          task_definition: task_definition_arn,
+          desired_count: 0,
+          role: @role,
+          deployment_configuration: @deployment_configuration,
+        }
+        if ecs_elb_client.find_or_create_load_balancer(front_port)
+          params[:load_balancers] = [
+            @ecs_elb_client.load_balancer_params_for_service.merge(container_name: 'front', container_port: 80),
+          ]
         end
+        ecs_client.create_service(params).service
       end
 
       # @param [Aws::ECS::Types::Service] service
@@ -617,11 +632,23 @@ module Hako
       end
 
       # @param [Aws::ECS::Types::Service] service
-      # @return [nil]
+      # @return [Boolean]
       def wait_for_ready(service)
         latest_event_id = find_latest_event_id(service.events)
         Hako.logger.debug "  latest_event_id=#{latest_event_id}"
+        started_at =
+          if @timeout
+            Process.clock_gettime(Process::CLOCK_MONOTONIC)
+          end
+
         loop do
+          if started_at
+            if Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at > @timeout
+              Hako.logger.error('Timed out')
+              return false
+            end
+          end
+
           s = ecs_client.describe_services(cluster: service.cluster_arn, services: [service.service_arn]).services[0]
           if s.nil?
             Hako.logger.debug "Service #{service.service_arn} could not be described"
@@ -640,7 +667,7 @@ module Hako
           primary = s.deployments.find { |d| d.status == 'PRIMARY' }
           primary_ready = primary && primary.running_count == primary.desired_count
           if no_active && primary_ready
-            return
+            return true
           else
             sleep 1
           end

data/lib/hako/version.rb

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

metadata

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