ci-queue 0.87.0 → 0.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8255493f3c842cc8d7a269e8ad22a3aab8928d4d2f98034f09f5effffd9e5ebb
-  data.tar.gz: d43ce59b7114d41afbf758973e6bdab5a676ddae8e1a1c56665597c60e6a6e72
+  metadata.gz: 87b11dfe365c8f57a79ef1d5b65e4f422a1fce2bd94d51b0d653d10bfb95120a
+  data.tar.gz: 1a530c84f9883b85f0784b33e67044f5a325a5815dc06d4b89872b76d1127a74
 SHA512:
-  metadata.gz: c11eaad88240e00781014d7c8d4e3390e995e412d3ab09ad1f3375a853aca77d278f49c4d8563a3872cdd66e399ef1c107f1acd57344ad5b815202fc9ee8e17b
-  data.tar.gz: 8e0c09faf71e486b5096b9a13f377842e4b59dde5ed59f5607b42733525612c810a57a178743d2cb7fcd1bdb83860a2331ef5a09ddbd73b0ec0aa18ee43829c9
+  metadata.gz: 25e7f86d44fc3428e6f1d08430a3940348ae9d2d2561c190894d7a6e1b197d00b22a97fefcb5ade8462d2ccc0e14255ff9d4f10571e5f1f99dd8758b45d8a066
+  data.tar.gz: 0c676475b941684ad92d43088612e31adb597f2f2c22f383e55c8d2dbc2cfa68646e013a58000191f5fecb16aee8151b5ce8f14cd97fe2d9ca2f11c3fd57cf3f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ci-queue (0.87.0)
+    ci-queue (0.89.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/queue_entry.rb

@@ -17,7 +17,9 @@ module CI
       end
 
       def self.format(test_id, file_path)
-        JSON.dump({ test_id: test_id, file_path: file_path })
+        raise ArgumentError, "file_path is required for '#{test_id}' — the test file path must be resolvable" if file_path.nil? || file_path.empty?
+        canonical = load_error_payload?(file_path) ? file_path : ::File.expand_path(file_path)
+        JSON.dump({ test_id: test_id, file_path: canonical })
       end
 
       def self.load_error_payload?(file_path)

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/redis/build_record.rb

@@ -145,6 +145,10 @@ module CI
           redis.hgetall(key('error-reports')).transform_keys { |entry| CI::Queue::QueueEntry.test_id(entry) }
         end
 
+        def failed_test_entries
+          redis.hkeys(key('error-reports'))
+        end
+
         def flaky_reports
           redis.smembers(key('flaky-reports')).map { |entry| CI::Queue::QueueEntry.test_id(entry) }
         end
@@ -177,6 +181,16 @@ module CI
               pipeline.hdel(key(stat_name), config.worker_id)
             end
           end
+          # Purge any error-report-deltas that reference this worker so that
+          # apply_error_report_delta_correction cannot double-subtract from
+          # the now-zeroed counters on a subsequent successful retry.
+          deltas = redis.hgetall(key('error-report-deltas'))
+          to_delete = deltas.filter_map do |entry, delta_json|
+            entry if JSON.parse(delta_json)['worker_id'].to_s == config.worker_id.to_s
+          rescue JSON::ParserError
+            nil
+          end
+          redis.hdel(key('error-report-deltas'), *to_delete) unless to_delete.empty?
         end
 
         private

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

@@ -28,9 +28,24 @@ module CI
           self
         end
 
+        # Queue a Redis SADD so that BuildRecord#record_success can include this
+        # in its multi-exec transaction. Without this, Static#acknowledge returns
+        # a Ruby value (not a Redis future), shifting the result indices and
+        # breaking the stats delta correction.
+        def acknowledge(entry, error: nil, pipeline: redis)
+          @progress += 1
+          return @progress unless pipeline
+          test_id = CI::Queue::QueueEntry.test_id(entry)
+          pipeline.sadd(key('processed'), test_id)
+        end
+
         private
 
         attr_reader :redis
+
+        def key(*args)
+          ['build', config.build_id, *args].join(':')
+        end
       end
     end
   end

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

@@ -158,6 +158,15 @@ module CI
           log.select! { |entry| failures.include?(CI::Queue::QueueEntry.test_id(entry)) }
           log.uniq! { |entry| CI::Queue::QueueEntry.test_id(entry) }
           log.reverse!
+
+          if log.empty?
+            # Per-worker log has no matching failures — this worker didn't run
+            # the failing tests (e.g. Buildkite rebuild with new worker IDs,
+            # or a different parallel slot). Fall back to ALL unresolved
+            # failures from error-reports so any worker can retry them.
+            log = redis.hkeys(key('error-reports'))
+          end
+
           Retry.new(log, config, redis: redis)
         end
 

data/lib/ci/queue/version.rb

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

data/lib/minitest/queue.rb

@@ -330,7 +330,16 @@ module Minitest
       end
 
       def queue_entry
-        @queue_entry ||= CI::Queue::QueueEntry.format(id, nil)
+        @queue_entry ||= begin
+          unless runnable.is_a?(Module)
+            raise ArgumentError, "runnable must be a Module (got #{runnable.class}). " \
+              "Do not create SingleExample with string class names."
+          end
+          file_path = runnable.instance_method(method_name).source_location&.first
+          raise ArgumentError, "Cannot resolve source file for #{id} — " \
+            "ensure the test method is defined in a Ruby source file" if file_path.nil?
+          CI::Queue::QueueEntry.format(id, file_path)
+        end
       end
 
       def <=>(other)

data/lib/rspec/queue/build_status_recorder.rb

@@ -18,13 +18,13 @@ module RSpec
 
       def example_passed(notification)
         example = notification.example
-        entry = CI::Queue::QueueEntry.format(example.id, nil)
+        entry = CI::Queue::QueueEntry.format(example.id, example.file_path)
         build.record_success(entry)
       end
 
       def example_failed(notification)
         example = notification.example
-        entry = CI::Queue::QueueEntry.format(example.id, nil)
+        entry = CI::Queue::QueueEntry.format(example.id, example.file_path)
         build.record_error(entry, dump(notification))
       end
 

data/lib/rspec/queue.rb

@@ -254,7 +254,10 @@ module RSpec
       end
 
       def queue_entry
-        @queue_entry ||= CI::Queue::QueueEntry.format(id, nil)
+        @queue_entry ||= begin
+          file_path = example.metadata[:absolute_file_path] || example.file_path
+          CI::Queue::QueueEntry.format(id, file_path)
+        end
       end
 
       def <=>(other)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.87.0
+  version: 0.89.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