wrapbox 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a28f3af84133c270e231a949bd36a0fdde4cc202f8f8f67de03e52075cacf44
-  data.tar.gz: 4bdb1546a8241d60bff8023d0b0201763ac40bfd55897521ead82ae94086b930
+  metadata.gz: 499da8de956c6c61f2ca34b4bb049c9eb157c6f45ca47d6a26e945359e981b80
+  data.tar.gz: 4ccd2cca92341d42f4fc301cbe51cf0c42d2901a4f6e7c4002eb7db80deeabbe
 SHA512:
-  metadata.gz: ba3d465e670b3608b190b0859ab1bf5af1113a005a5a1f573b39828d835c4987a06506ae563ad293450b007ea6ac288961ef070359578c8d1549532e4d53af76
-  data.tar.gz: 9dcf2cd150611c6c140320d0b457cc4ba16f9ffd531dc70b15b4577997ff40cfebb72cdafdf7d3b9dbaf4f27d613e41ce5e9c8e87bee816266bf12badc4b9dab
+  metadata.gz: aa498ca42d1b1fa4beb7e0f8be8760ff074ca0c6d090a9b1a51944e198821f3985434747d6e0c3f21acf0c6941f18cd0474488624fa28e87e5f7cec4533d8eef
+  data.tar.gz: 67963b588f10bb0046a2ced0eb8d42935e7562d281b473b801ba289fb7c2c9d4abbc39e014212ecf7e4e12f3e8adb4595c8ba9e1aafc4c850b8eedd99f0f6aa8

data/lib/wrapbox/log_fetcher/papertrail.rb

@@ -24,7 +24,7 @@ module Wrapbox
 
       def stop
         @stop = true
-        @loop_thread.join(STOP_WAIT_TIMELIMIT)
+        @loop_thread&.join(STOP_WAIT_TIMELIMIT)
       end
 
       def main_loop

data/lib/wrapbox/runner/docker.rb

@@ -17,6 +17,7 @@ module Wrapbox
       def initialize(options)
         @name = options[:name]
         @container_definitions = options[:container_definition] ? [options[:container_definition]] : options[:container_definitions]
+        @logger = Logger.new($stdout)
 
         if @container_definitions.size >= 2
           raise "Docker runner does not support multi container currently"
@@ -37,15 +38,16 @@ module Wrapbox
         exec_docker(definition: definition, cmd: ["bundle", "exec", "rake", "wrapbox:run"], environments: envs)
       end
 
-      def run_cmd(cmds,  container_definition_overrides: {}, environments: [])
+      def run_cmd(cmds,  container_definition_overrides: {}, environments: [], ignore_signal: false)
+        ths = []
         definition = container_definition
           .merge(container_definition_overrides)
 
         environments = extract_environments(environments)
 
         cmds << nil if cmds.empty?
-        ths = cmds.map.with_index do |cmd, idx|
-          Thread.new(cmd, idx) do |c, i|
+        cmds.each_with_index do |cmd, idx|
+          ths << Thread.new(cmd, idx) do |c, i|
             envs = environments + ["WRAPBOX_CMD_INDEX=#{idx}"]
             exec_docker(
               definition: definition,
@@ -54,7 +56,23 @@ module Wrapbox
             )
           end
         end
-        ths.each(&:join)
+        ths.each { |th| th&.join }
+
+        true
+      rescue SignalException => e
+        sig = "SIG#{Signal.signame(e.signo)}"
+        if ignore_signal
+          @logger.info("Receive #{sig} signal. But Docker container continue running")
+        else
+          @logger.info("Receive #{sig} signal. Stop All tasks")
+          ths.each do |th|
+            th.report_on_exception = false
+            th.raise(e)
+          end
+          thread_timeout = 15
+          ths.each { |th| th.join(thread_timeout) }
+        end
+        nil
       end
 
       private
@@ -93,6 +111,9 @@ module Wrapbox
         unless resp["StatusCode"].zero?
           raise ExecutionError, "exit_code=#{resp["StatusCode"]}"
         end
+      rescue SignalException => e
+        sig = Signal.signame(e.signo)
+        container&.kill(signal: sig)
       ensure
         container.remove(force: true) if container && !keep_container
       end
@@ -116,6 +137,7 @@ module Wrapbox
         method_option :cpu, type: :numeric
         method_option :memory, type: :numeric
         method_option :environments, aliases: "-e"
+        method_option :ignore_signal, type: :boolean, default: false, desc: "Even if receive a signal (like TERM, INT, QUIT), Docker container continue running"
         def run_cmd(*args)
           repo = Wrapbox::ConfigRepository.new.tap { |r| r.load_yaml(options[:config]) }
           config = repo.get(options[:config_name])
@@ -129,7 +151,9 @@ module Wrapbox
           else
             container_definition_overrides = {}
           end
-          runner.run_cmd(args, environments: environments, container_definition_overrides: container_definition_overrides)
+          unless runner.run_cmd(args, environments: environments, container_definition_overrides: container_definition_overrides, ignore_signal: options[:ignore_signal])
+            exit 1
+          end
         end
       end
     end

data/lib/wrapbox/runner/ecs.rb

@@ -22,6 +22,7 @@ module Wrapbox
 
       EXECUTION_RETRY_INTERVAL = 3
       WAIT_DELAY = 5
+      TERM_TIMEOUT = 120
       HOST_TERMINATED_REASON_REGEXP = /Host EC2.*terminated/
 
       attr_reader \
@@ -128,12 +129,14 @@ module Wrapbox
         )
       end
 
-      def run_cmd(cmds, container_definition_overrides: {}, **parameters)
+      def run_cmd(cmds, container_definition_overrides: {}, ignore_signal: false, **parameters)
+        ths = []
+
         task_definition = prepare_task_definition(container_definition_overrides)
 
         cmds << nil if cmds.empty?
-        ths = cmds.map.with_index do |cmd, idx|
-          Thread.new(cmd, idx) do |c, i|
+        cmds.each_with_index do |cmd, idx|
+          ths << Thread.new(cmd, idx) do |c, i|
             Thread.current[:cmd_index] = i
             envs = (parameters[:environments] || []) + [{name: "WRAPBOX_CMD_INDEX", value: i.to_s}]
             run_task(
@@ -144,6 +147,25 @@ module Wrapbox
           end
         end
         ths.each(&:join)
+
+        true
+      rescue SignalException => e
+        sig = "SIG#{Signal.signame(e.signo)}"
+        if ignore_signal
+          @logger.info("Receive #{sig} signal. But ECS Tasks continue running")
+        else
+          @logger.info("Receive #{sig} signal. Stop All tasks")
+          ths.each do |th|
+            th.report_on_exception = false
+            th.raise(e)
+          end
+          wait_until = Time.now + TERM_TIMEOUT + 15 # thread_timeout_buffer
+          ths.each do |th|
+            wait = wait_until - Time.now
+            th.join(wait) if wait.positive?
+          end
+        end
+        nil
       end
 
       private
@@ -158,6 +180,8 @@ module Wrapbox
 
         begin
           task = create_task(task_definition_arn, class_name, method_name, args, command, parameter)
+          return unless task # only Task creation aborted by SignalException
+
           @log_fetcher.run if @log_fetcher
 
           @logger.debug("Launch Task: #{task.task_arn}")
@@ -188,6 +212,14 @@ module Wrapbox
             sleep EXECUTION_RETRY_INTERVAL
             retry
           end
+        rescue SignalException
+          client.stop_task(
+            cluster: cl,
+            task: task.task_arn,
+            reason: "signal interrupted"
+          )
+          wait_task_stopped(cl, task.task_arn, TERM_TIMEOUT)
+          @logger.debug("Stop Task: #{task.task_arn}")
         ensure
           if @log_fetcher
             begin
@@ -209,10 +241,12 @@ module Wrapbox
         begin
           run_task_options = build_run_task_options(task_definition_arn, class_name, method_name, args, command, cl, parameter.environments, parameter.task_role_arn)
           @logger.debug("Task Options: #{run_task_options}")
-          task = client
-            .run_task(run_task_options)
-            .tasks[0]
+          resp = client.run_task(run_task_options)
+          task = resp.tasks[0]
 
+          resp.failures.each do |failure|
+            @logger.debug("Failure: Arn=#{failure.arn}, Reason=#{failure.reason}")
+          end
           raise LackResource unless task # this case is almost lack of container resource.
 
           @logger.debug("Create Task: #{task.task_arn}")
@@ -270,6 +304,17 @@ module Wrapbox
             current_retry_interval = [current_retry_interval * parameter.retry_interval_multiplier, parameter.max_retry_interval].min
             retry
           end
+        rescue SignalException
+          if task
+            client.stop_task(
+              cluster: cl,
+              task: task.task_arn,
+              reason: "signal interrupted"
+            )
+            wait_task_stopped(cl, task.task_arn, TERM_TIMEOUT)
+            @logger.debug("Stop Task: #{task.task_arn}")
+            nil
+          end
         end
       end
 
@@ -409,6 +454,12 @@ module Wrapbox
               name: main_container_name,
               environment: env,
             }.tap { |o| o[:command] = command if command },
+            *container_definitions.drop(1).map do |c|
+              {
+                name: c[:name],
+                environment: env,
+              }
+            end
           ],
         }
         role_arn = task_role_arn || self.task_role_arn
@@ -449,6 +500,7 @@ module Wrapbox
         method_option :launch_retry, type: :numeric
         method_option :execution_retry, type: :numeric
         method_option :max_retry_interval, type: :numeric
+        method_option :ignore_signal, type: :boolean, default: false, desc: "Even if receive a signal (like TERM, INT, QUIT), ECS Tasks continue running"
         def run_cmd(*args)
           repo = Wrapbox::ConfigRepository.new.tap { |r| r.load_yaml(options[:config]) }
           config = repo.get(options[:config_name])
@@ -464,14 +516,17 @@ module Wrapbox
             launch_timeout: options[:launch_timeout],
             launch_retry: options[:launch_retry],
             execution_retry: options[:execution_retry],
-            max_retry_interval: options[:max_retry_interval]
+            max_retry_interval: options[:max_retry_interval],
+            ignore_signal: options[:ignore_signal],
           }.reject { |_, v| v.nil? }
           if options[:cpu] || options[:memory]
             container_definition_overrides = {cpu: options[:cpu], memory: options[:memory]}.reject { |_, v| v.nil? }
           else
             container_definition_overrides = {}
           end
-          runner.run_cmd(args, environments: environments, container_definition_overrides: container_definition_overrides, **run_options)
+          unless runner.run_cmd(args, environments: environments, container_definition_overrides: container_definition_overrides, **run_options)
+            exit 1
+          end
         end
       end
     end

data/lib/wrapbox/version.rb

@@ -1,3 +1,3 @@
 module Wrapbox
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wrapbox
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - joker1007
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-29 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk