parallel_cucumber 0.2.22 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d312aab611528ffc08d935c5871ba120f18e27364de8ab2bd5ea42183e4ce46
-  data.tar.gz: 9c5f960b08d8b2f03fc937387bb735ca447791b49381c803f9d34811eb35ee9e
+  metadata.gz: 9bb333397a44aa5a42a0ab3fd0b2ff757727eb9fc63bb01960ad1a6d92f7d40e
+  data.tar.gz: 7615b9ececcb23e8e8ce863e1bc77a021a28f14cfadd710bbc9e5a7b7d68c329
 SHA512:
-  metadata.gz: c79e25152a7f1f991b8dbc407904b8421e0eca3cc8fc45cf2217d5f0e3d39fff716310b38f77380b0d91c46bc3819002a37b735dcb8bcd0c894628827bdf4a8c
-  data.tar.gz: f4a846cf322989b8c60d95b23e3b744408c73729aecb8f12919479c21c636f35868060aaa7afb20e1d2b54472df06f022f22529ac97f874cae8d0741c804518a
+  metadata.gz: 969b2a5e2dafad3fd558ba5e0cfc9ea0cbb7f2510c8ecb3d968668490b9b86319c123447989998f3e4370a45153e8b13c1eabe6060457955d264dda81e3c5b74
+  data.tar.gz: 2065449df4c9997df9f9e19bbbedebe8b64679d307fe91b4e4ce4106e82b8270a51e13d8706976a3caaa1cb2b85f8aacf9eee178e7b31cc91f6fa059db2e135d

data/lib/parallel_cucumber/helper/command.rb

@@ -15,8 +15,13 @@ module ParallelCucumber
         end
 
         ONE_SECOND = 1
+        STACKTRACE_COLLECTION_TIMEOUT = 10
 
-        def exec_command(env, desc, script, logger, log_decoration = {}, timeout: 30, capture: false, return_script_error: false) # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
+        # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
+        def exec_command(env, desc, script, logger, log_decoration = {},
+                         timeout: 30, capture: false, return_script_error: false,
+                         return_on_timeout: false, collect_stacktrace: false
+        )
           block_name = ''
           if log_decoration['worker_block']
             if log_decoration['start'] || log_decoration['end']
@@ -28,42 +33,48 @@ module ParallelCucumber
           full_script = "#{script} 2>&1"
           env_string = env.map { |k, v| "#{k}=#{v}" }.sort.join(' ')
           logger << "== Running command `#{full_script}` at #{Time.now}\n== with environment variables: #{env_string}\n"
-          pstat = nil
+          wait_thread = nil
           pout = nil
           capture &&= [''] # Pass by reference
           exception = nil
+          command_pid = nil
 
           begin
             completed = begin
-              pin, pout, pstat = Open3.popen2e(env, full_script)
-              logger << "Command has pid #{pstat[:pid]}\n"
+              pin, pout, wait_thread = Open3.popen2e(env, full_script)
+              command_pid = wait_thread[:pid].to_s
+              logger << "Command has pid #{command_pid}\n"
               pin.close
               out_reader = Thread.new do
-                output_reader(pout, pstat, logger, capture)
+                output_reader(pout, wait_thread, logger, capture)
               end
 
               unless out_reader.join(timeout)
                 raise TimedOutError
               end
 
-              graceful_process_shutdown(out_reader, pstat, pout, logger)
+              graceful_process_shutdown(out_reader, wait_thread, pout, logger)
 
-              pstat.value # reap already-terminated child.
-              "Command completed #{pstat.value} at #{Time.now}"
+              wait_thread.value # reap already-terminated child.
+              "Command completed #{wait_thread.value} at #{Time.now}"
             end
 
             logger << "#{completed}\n"
 
-            raise "Script returned #{pstat.value.exitstatus}" unless pstat.value.success? || return_script_error
+            raise "Script returned #{wait_thread.value.exitstatus}" unless wait_thread.value.success? || return_script_error
 
             capture_or_empty = capture ? capture.first : '' # Even '' is truthy
-            return pstat.value.success? ? capture_or_empty : nil
+            return wait_thread.value.success? ? capture_or_empty : nil
           rescue TimedOutError => e
-            force_kill_process_with_tree(out_reader, pstat, pout, full_script, logger, timeout)
+            process_tree = Helper::Processes.ps_tree
+            send_usr1_to_process_with_tree(command_pid, full_script, logger, process_tree) if collect_stacktrace
+            force_kill_process_with_tree(out_reader, wait_thread, pout, full_script, logger, timeout, process_tree, command_pid)
+
+            return capture.first if return_on_timeout
 
             exception = e
           rescue => e
-            logger.debug("Exception #{pstat ? pstat[:pid] : "pstat=#{pstat}=nil"}")
+            logger.debug("Exception #{wait_thread ? wait_thread[:pid] : "wait_thread=#{wait_thread}=nil"}")
             trace = e.backtrace.join("\n\t").sub("\n\t", ": #{$ERROR_INFO}#{e.class ? " (#{e.class})" : ''}\n\t")
             logger.error("Threw for #{full_script}, caused #{trace}")
 
@@ -75,6 +86,7 @@ module ParallelCucumber
 
           raise exception
         end
+        # rubocop:enable Metrics/ParameterLists, Metrics/LineLength
 
         def log_until_incomplete_line(logger, out_string)
           loop do
@@ -87,13 +99,13 @@ module ParallelCucumber
 
         private
 
-        def output_reader(pout, pstat, logger, capture)
+        def output_reader(pout, wait_thread, logger, capture)
           out_string = ''
 
           loop do
             io_select = IO.select([pout], [], [], ONE_SECOND)
-            unless io_select || pstat.alive?
-              logger << "\n== Terminating because io_select=#{io_select} when pstat.alive?=#{pstat.alive?}\n"
+            unless io_select || wait_thread.alive?
+              logger << "\n== Terminating because io_select=#{io_select} when wait_thread.alive?=#{wait_thread.alive?}\n"
               break
             end
             next unless io_select
@@ -103,44 +115,45 @@ module ParallelCucumber
             out_string = log_until_incomplete_line(logger, out_string + partial)
           end
         rescue EOFError
-          logger << "\n== EOF is normal exit, #{pstat.inspect}\n"
+          logger << "\n== EOF is normal exit, #{wait_thread.inspect}\n"
         rescue => e
           logger << "\n== Exception in out_reader due to #{e.inspect} #{e.backtrace}\n"
         ensure
           logger << out_string
           logger << ["\n== Left out_reader at #{Time.now}; ",
-                     "pipe=#{pstat.status}+#{pstat.status ? '≤no value≥' : pstat.value}\n"].join
+                     "pipe=#{wait_thread.status}+#{wait_thread.status ? '≤no value≥' : wait_thread.value}\n"].join
         end
 
-        def graceful_process_shutdown(out_reader, pstat, pout, logger)
-          out_reader.value # Should terminate with pstat
+        def graceful_process_shutdown(out_reader, wait_thread, pout, logger)
+          out_reader.value # Should terminate with wait_thread
           pout.close
-          if pstat.status
-            logger << "== Thread #{pstat.inspect} is not dead"
+          if wait_thread.status
+            logger << "== Thread #{wait_thread.inspect} is not dead"
 
-            if pstat.join(3)
-              logger << "== Thread #{pstat.inspect} joined late"
+            if wait_thread.join(3)
+              logger << "== Thread #{wait_thread.inspect} joined late"
             else
-              pstat.terminate # Just in case
-              logger << "== Thread #{pstat.inspect} terminated"
+              wait_thread.terminate # Just in case
+              logger << "== Thread #{wait_thread.inspect} terminated"
             end # Make an effort to reap
           end
 
-          pstat.value # reap already-terminated child.
-          "Command completed #{pstat.value} at #{Time.now}"
+          wait_thread.value # reap already-terminated child.
+          "Command completed #{wait_thread.value} at #{Time.now}"
         end
 
-        def force_kill_process_with_tree(out_reader, pstat, pout, full_script, logger, timeout) # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
+        def send_usr1_to_process_with_tree(command_pid, full_script, logger, tree)
+          return if Helper::Processes.ms_windows?
+
+          logger << "Timeout, so trying SIGUSR1 to trigger watchdog stacktrace #{command_pid}=#{full_script}"
+          Helper::Processes.kill_tree('SIGUSR1', command_pid, logger, tree)
+          sleep(STACKTRACE_COLLECTION_TIMEOUT) # Wait enough time for child processes to act on SIGUSR1
+        end
+
+        def force_kill_process_with_tree(out_reader, wait_thread, pout, full_script, logger, timeout, tree, pid) # rubocop:disable Metrics/ParameterLists, Metrics/LineLength
           out_reader.exit
-          tree = Helper::Processes.ps_tree
-          pid = pstat[:pid].to_s
-          unless Helper::Processes.ms_windows?
-            logger << "Timeout, so trying SIGUSR1 to trigger watchdog stacktrace #{pstat[:pid]}=#{full_script}"
-            Helper::Processes.kill_tree('SIGUSR1', pid, logger, tree)
-            sleep 2
-          end
 
-          logger << "Timeout, so trying SIGINT at #{pstat[:pid]}=#{full_script}"
+          logger << "Timeout, so trying SIGINT at #{wait_thread[:pid]}=#{full_script}"
 
           log_copy = Thread.new do
             pout.each_line { |l| logger << l }
@@ -167,7 +180,7 @@ module ParallelCucumber
             end
 
             logger << "About to reap root #{pid}"
-            pstat.value # reap root - everything else should be reaped by init.
+            wait_thread.value # reap root - everything else should be reaped by init.
             logger << "Reaped root #{pid}"
           end
         end

data/lib/parallel_cucumber/helper/processes.rb

@@ -35,7 +35,7 @@ module ParallelCucumber
           else
             descendants(root, logger, tree, old_tree, 'kill') do |pid, node|
               begin
-                logger.warn "Killing #{node}"
+                logger.warn "Sending signal #{sig} to #{node}"
                 Process.kill(sig, pid.to_i)
               rescue Errno::ESRCH
                 nil # It's gone already? Hurrah!
@@ -44,7 +44,7 @@ module ParallelCucumber
           end
           # Let's kill pid unconditionally: descendants will go astray once reparented.
           begin
-            logger.warn "Killing #{root} just in case"
+            logger.warn "Sending signal #{sig} to root process #{root} just in case"
             Process.kill(sig, root.to_i)
           rescue Errno::ESRCH
             nil # It's gone already? Hurrah!

data/lib/parallel_cucumber/version.rb

@@ -1,3 +1,3 @@
 module ParallelCucumber
-  VERSION = '0.2.22'.freeze
+  VERSION = '0.2.23'.freeze
 end

data/lib/parallel_cucumber/worker.rb

@@ -201,7 +201,8 @@ module ParallelCucumber
       begin
         ParallelCucumber::Helper::Command.exec_command(
           batch_env, 'batch', mapped_batch_cmd, @logger, @log_decoration,
-          timeout: @batch_timeout, return_script_error: true
+          timeout: @batch_timeout, capture: true, return_script_error: true,
+          return_on_timeout: true, collect_stacktrace: true
         )
       rescue => e
         @logger << "ERROR #{e} #{e.backtrace.first(5)}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_cucumber
 version: !ruby/object:Gem::Version
-  version: 0.2.22
+  version: 0.2.23
 platform: ruby
 authors:
 - Alexander Bayandin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.73.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.59.2
+        version: 0.73.0
 description: Our own parallel cucumber with queue and workers
 email: a.bayandin@gmail.com
 executables:
@@ -112,7 +112,7 @@ homepage: https://github.com/badoo/parallel_cucumber
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +127,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Run cucumber in parallel
 test_files: []