hako 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 54859bce2bfc4f5a8b7d4fa55afb605119aa3a80
-  data.tar.gz: b9f1cdd54ccd8a09a68407dfa89237d8a245d3d7
+  metadata.gz: d2aaacf745660c3193a66d0527ff2ec56dac915b
+  data.tar.gz: 3110462e23bdaf2318eb964735405e38bdcd1176
 SHA512:
-  metadata.gz: d719c61cfa81b858b45cd17a0c1b31d166f3daf6010a588f33715d369dbaac87638515e5b3dd1f39ec1d0922bac09a4c1d8222bb2e70c908c6316f021397a10a
-  data.tar.gz: 90497feaab9dcd664fb4dbce60269b19530fbb526e64861ba10fcdc9afcbfc11373476f592318f51f7acb1b795776b29b5aacd198ed63bc5edefcec127cb191b
+  metadata.gz: 0e2f3a18e41a7cf61b25feea55feaa258d0365759d6cd24adaeb01b0b78c67cddbf6a1f94158cc2234b384506f612ed0b0645921331ccc5304ef51b8ab6ca7a0
+  data.tar.gz: d36842d199259f48306ba64fef90db984d84909971f2599e11429d2f95e6d6be511b8d6629b099cc2e825cd482f3830dfa79f6295b2a56da0017765250e63487

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.3.0 (2017-05-15)
+## New features
+- Add `oneshot_notification_prefix` option
+    - This is **experimental** , so might be reverted in near version.
+    - This option enables S3 polling instead of ECS polling.
+
 # 1.2.1 (2017-05-11)
 ## Bug fixes
 - Retry DescribeTasks when rate limited

data/lib/hako/schedulers/ecs.rb

@@ -38,6 +38,7 @@ module Hako
           @autoscaling = EcsAutoscaling.new(options.fetch('autoscaling'), dry_run: @dry_run)
         end
         @autoscaling_group_for_oneshot = options.fetch('autoscaling_group_for_oneshot', nil)
+        @oneshot_notification_prefix = options.fetch('oneshot_notification_prefix', nil)
         @deployment_configuration = {}
         %i[maximum_percent minimum_healthy_percent].each do |key|
           @deployment_configuration[key] = options.dig('deployment_configuration', key.to_s)
@@ -541,11 +542,21 @@ module Hako
         exit_code
       end
 
+      # @param [Aws::ECS::Types::Task] task
+      # @return [Hash<String, Aws::ECS::Types::Container>]
+      def wait_for_task(task)
+        if @oneshot_notification_prefix
+          poll_task_status_from_s3(task)
+        else
+          poll_task_status_from_ecs(task)
+        end
+      end
+
       MIN_WAIT_TASK_INTERVAL = 1
       MAX_WAIT_TASK_INTERVAL = 120
       # @param [Aws::ECS::Types::Task] task
-      # @return [nil]
-      def wait_for_task(task)
+      # @return [Hash<String, Aws::ECS::Types::Container>]
+      def poll_task_status_from_ecs(task)
         task_arn = task.task_arn
         interval = 1
         loop do
@@ -591,6 +602,55 @@ module Hako
         end
       end
 
+      # @param [Aws::ECS::Types::Task] task
+      # @return [Hash<String, Aws::ECS::Types::Container>]
+      # Experimental: Get stopped container status from S3.
+      # The advantage is scalability; ecs:DescribeTasks is heavily
+      # rate-limited, but s3:GetObject is much more scalable.
+      # The JSON is supposed to be stored from Amazon ECS Event Stream.
+      # http://docs.aws.amazon.com/AmazonECS/latest/developerguide/cloudwatch_event_stream.html
+      def poll_task_status_from_s3(task)
+        s3 = Aws::S3::Client.new
+        task_arn = task.task_arn
+        uri = URI.parse(@oneshot_notification_prefix)
+        prefix = uri.path.sub(%r{\A/}, '')
+        started_key = "#{prefix}/#{task_arn}/started.json"
+        stopped_key = "#{prefix}/#{task_arn}/stopped.json"
+
+        loop do
+          unless @started_at
+            begin
+              object = s3.get_object(bucket: uri.host, key: started_key)
+            rescue Aws::S3::Errors::NoSuchKey
+              Hako.logger.debug("  s3://#{uri.host}/#{started_key} doesn't exist")
+            else
+              json = JSON.parse(object.body.read)
+              @started_at = Time.parse(json['detail']['startedAt'])
+              if @started_at
+                Hako.logger.info "Started at #{@started_at}"
+              end
+            end
+          end
+
+          begin
+            object = s3.get_object(bucket: uri.host, key: stopped_key)
+          rescue Aws::S3::Errors::NoSuchKey
+            Hako.logger.debug("  s3://#{uri.host}/#{stopped_key} doesn't exist")
+          else
+            json = JSON.parse(object.body.read)
+            task = Aws::Json::Parser.new(Aws::ECS::Client.api.operation('describe_tasks').output.shape.member(:tasks).shape.member).parse(json['detail'].to_json)
+            Hako.logger.info "Stopped at #{task.stopped_at} (reason: #{task.stopped_reason})"
+            containers = {}
+            task.containers.each do |c|
+              containers[c.name] = c
+            end
+            return containers
+          end
+
+          sleep 1
+        end
+      end
+
       # @param [String] container_instance_arn
       # @return [nil]
       def report_container_instance(container_instance_arn)

data/lib/hako/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hako
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hako
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk