ci-queue 0.86.0 → 0.88.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7708a4b0506c58da9ae1c6681dd335967c584869bf7b4a60546fc43f06a6cfe8
-  data.tar.gz: 22e9a6260641835f028c9952e10c3c0dfa4882156bf393b0b1a13befbee89432
+  metadata.gz: ac982ecc1b30c78d14e45bbbe7d8e26841879eae6fec791dd82508159ce6c8dd
+  data.tar.gz: 7f960c1a77b8e93bd8c18894b86f428df16f181f671bb7e000063a968e50374c
 SHA512:
-  metadata.gz: 697d15d2ada5cae5ace00714a47b91fbb32ebf61a3abf7b181fb4293b560ba837e02c1f88aef40832a9534fcdc45a049c1ef8d19bf5b4b537f2b53d4ca1d6cf5
-  data.tar.gz: 225d1ec46ad29137111f16f18431212db237eeaa91871fb9ece7e0e35ba34270b4272b2ce26cff3b178214feb6643a75b5266ae86d41aef5ba47952064996a81
+  metadata.gz: 1582e95243e4939268acc7bbaced2fc90471b0b86934d35169647ccde1e19c8d03027650e1f9efa909c2d6aafc85c8cce8a251c65de3cecdc906e64da8bb2a0b
+  data.tar.gz: d8c67176e15c7d78b175af35309bab1136a3053da0db9404449d5770b764bba1e0d25c6671607c090d5e8951e65711ea94eded4cd59f50032b8336fea1eeed7b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.86.0)
+    ci-queue (0.88.0)
       logger
 
 GEM
@@ -43,6 +43,8 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
+    mocha (3.1.0)
+      ruby2_keywords (>= 0.0.5)
     msgpack (1.8.0)
     parallel (1.27.0)
     parser (3.3.10.2)
@@ -86,6 +88,7 @@ GEM
       parser (>= 3.3.7.2)
       prism (~> 1.7)
     ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
     securerandom (0.4.1)
     simplecov (0.22.0)
       docile (~> 1.1)
@@ -112,6 +115,7 @@ DEPENDENCIES
   ci-queue!
   minitest (~> 5.11)
   minitest-reporters (~> 1.1)
+  mocha
   msgpack
   rake
   redis

data/ci-queue.gemspec

@@ -40,6 +40,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'redis'
   spec.add_development_dependency 'simplecov', '~> 0.12'
   spec.add_development_dependency 'minitest-reporters', '~> 1.1'
+  spec.add_development_dependency 'mocha'
 
   spec.add_development_dependency 'rexml'
   spec.add_development_dependency 'snappy'

data/lib/ci/queue/redis/base.rb

@@ -264,6 +264,8 @@ module CI
         end
 
         class HeartbeatProcess
+          MAX_RESTART_ATTEMPTS = 3
+
           def initialize(redis_url, zset_key, owners_key, leases_key)
             @redis_url = redis_url
             @zset_key = zset_key
@@ -313,10 +315,28 @@ module CI
 
           def tick!(id, lease)
             send_message(:tick!, id: id, lease: lease.to_s)
+            @restart_attempts = 0
+          rescue IOError, Errno::EPIPE => error
+            @restart_attempts = (@restart_attempts || 0) + 1
+            raise if @restart_attempts > MAX_RESTART_ATTEMPTS
+
+            restart!
+            retry
           end
 
           private
 
+          def restart!
+            @pipe.close rescue nil
+            begin
+              Process.kill(:TERM, @pid)
+              Process.waitpid2(@pid)
+            rescue Errno::ESRCH, Errno::ECHILD
+              nil
+            end
+            boot!
+          end
+
           def send_message(*message)
             payload = message.to_json
             @pipe.write([payload.bytesize].pack("L").b, payload)

data/lib/ci/queue/version.rb

@@ -2,7 +2,7 @@
 
 module CI
   module Queue
-    VERSION = '0.86.0'
+    VERSION = '0.88.0'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/runner.rb

@@ -71,6 +71,16 @@ module Minitest
             puts "Retrying failed tests."
             self.queue = retry_queue
           end
+        elsif retry? && !queue.rescue_connection_errors { queue.build.failed_tests }.empty?
+          # Automatic Buildkite retry (BUILDKITE_RETRY_TYPE=automatic): the main queue is
+          # exhausted but error_reports from the previous run still exist. Re-run failed
+          # tests so the report step can succeed if they pass this time.
+          reset_counters
+          retry_queue = queue.retry_queue
+          unless retry_queue.exhausted?
+            puts "Retrying failed tests."
+            self.queue = retry_queue
+          end
         end
 
         queue.rescue_connection_errors { queue.created_at = CI::Queue.time_now.to_f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.86.0
+  version: 0.88.0
 platform: ruby
 authors:
 - Jean Boussier
@@ -121,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement