specbandit 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70efc56f9de13cd1e141cbb1ad39ff22cf1a07cdfbcd2c1257cefc55f5cb73fe
-  data.tar.gz: 6070e8b72aec64162a3e37190e787abbd23bf464faf74d06212e401c7c312fed
+  metadata.gz: 24148d640548adc9f3bd6714ad39f4bfd380eeaf8e904f0fffd4b777a9b13d4c
+  data.tar.gz: '082673e08f9b40e9c8babae73f658d91b7627a40002b1e326d62fb49c5242d4f'
 SHA512:
-  metadata.gz: c7fc604a65cba2387b1177fef33ad2994e13677777d6d87b53f68aa29a00616c864dc874b5571947c4e837d0c3e25b24cc4d99d0841c94b79433258e8f5faba7
-  data.tar.gz: 7c6acd6833e1f082e2c764de7d32ab67407726d6905cc6246cbbe0921410f2ad3db4a503ee5932240414ebf413538830db54e8275adb4cd6c1f3d9bc71a195e4
+  metadata.gz: 06ced4b5b9530b9f836d90a0e05a663acf88d16f008c6f181acc19a1711ee6260465f42b7e27c76d3e16ec8d28ae621bfd4a614d2ec2aae26312927cb40fd3fb
+  data.tar.gz: 6f1578c3db2a446bce8677d16020014e4fa1c30e2483789f41311c1d18ba75567875a65728fca9f48136951b722b91631d674e995d2a66b1ebe26b99b910e128

data/README.md

@@ -319,7 +319,7 @@ The full decision table:
 | Yes | Drained / empty | Empty | **OK, exit 0.** Worker arriving late -- everything was already taken by peers and this runner has no re-run memory. |
 | Yes | Has data | Empty | **Steal.** Classic run: pop batches from the shared queue (and record them to the rerun key if one is configured). |
 | Yes | Drained / empty | Has data | **Replay.** Classic re-run: ignore the shared queue and re-run exactly the recorded files. |
-| Yes | Has data | Has data | **Crash** (exit 1). Inconsistent state -- refuses to run to avoid double-executing. |
+| Yes | Has data | Has data | **Full rerun.** The queue was re-pushed while this runner still holds rerun memory from a previous run. The stale rerun key is deleted and the runner steals from the shared queue like a classic run, re-recording as it goes. |
 
 > **Empty key names count as "not provided".** A `--key-rerun` whose value is an empty string -- e.g. `--key-rerun "$VAR"` where `$VAR` is unset in CI -- is treated exactly like `--key-rerun` being absent. The same applies to `--key-failed`: an empty/unset name is treated as "not configured" and no failed files are recorded.
 
@@ -351,7 +351,7 @@ The full decision table:
 
 Key details:
 
-- **Replay reads non-destructively** (`LRANGE`, not `LPOP`). The rerun key is never consumed. If you re-run the same runner multiple times, it replays the same files every time.
+- **Replay reads non-destructively** (`LRANGE`, not `LPOP`). Replay never consumes the rerun key, so re-running the same runner multiple times replays the same files every time. The one case where the rerun key is deleted (`DEL`) is a **full rerun** -- the shared queue has data again while the rerun key still holds files from a previous run -- where the stale memory is reset and rebuilt from the newly stolen batches.
 - **The shared queue is never touched in replay mode**. Other runners are unaffected.
 - **Each runner has its own rerun key**. Only the re-run runner enters replay mode; runners that aren't re-run don't start at all.
 
@@ -429,6 +429,7 @@ specbandit push --key "pr-42-run-100" --key-ttl 259200 --pattern 'spec/**/*_spec
 - **Steal** uses `LPOP key count` (Redis 6.2+), which atomically pops up to N elements. No Lua scripts, no locks, no race conditions.
 - **Record** (when `--key-rerun` is set): after each steal, the batch is also `RPUSH`ed to the per-runner rerun key.
 - **Replay** (when the rerun key has data and the shared queue is drained): reads all files from the rerun key via `LRANGE` (non-destructive), splits into batches, and runs them locally. The shared queue is never touched.
+- **Full rerun** (when both the shared queue and the rerun key have data): the stale rerun key is removed with `DEL`, then the runner steals from the shared queue and re-records as in a classic run.
 - **Mode selection** is derived entirely from Redis (published marker + queue/rerun state) -- see the decision table above. There is no re-run flag or environment variable.
 - **Run** delegates to the configured adapter:
   - **CLI adapter**: spawns a shell command per batch via `Open3`, appending file paths as arguments. Works with any test runner.

data/lib/specbandit/redis_queue.rb

@@ -88,6 +88,12 @@ module Specbandit
       with_retries { redis.lrange(key, 0, -1) }
     end
 
+    # Remove a key entirely. Used to discard stale rerun memory when a
+    # full rerun starts over from the shared queue.
+    def delete(key)
+      with_retries { redis.del(key) }
+    end
+
     def close
       redis.close
     end

data/lib/specbandit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Specbandit
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

data/lib/specbandit/worker.rb

@@ -76,7 +76,7 @@ module Specbandit
     #   Yes       | empty/drained  | empty       | OK: worker arriving late (0)
     #   Yes       | has data       | empty       | Steal (record if rerun key set)
     #   Yes       | empty/drained  | has data    | Replay recorded files
-    #   Yes       | has data       | has data    | Crash: inconsistent (weird case)
+    #   Yes       | has data       | has data    | Full rerun: reset rerun key, steal
     #
     # "Published" is a durable marker written by `specbandit push`; it is the
     # only reliable signal that work was ever enqueued, because Redis
@@ -89,7 +89,7 @@ module Specbandit
       rerun_files = key_present?(key_rerun) ? queue.read_all(key_rerun) : []
 
       if key_has_data && rerun_files.any?
-        fail_inconsistent_state
+        run_full_rerun
       elsif rerun_files.any?
         run_replay(rerun_files)
       elsif key_has_data
@@ -119,14 +119,16 @@ module Specbandit
       1
     end
 
-    # Both the shared queue and this runner's rerun key hold files at once.
-    # That should never happen: a fresh run has no rerun memory yet, and a
-    # re-run reads from a drained queue. Crash instead of double-executing.
-    def fail_inconsistent_state
-      output.puts "[specbandit] ERROR: inconsistent state — shared queue '#{key}' still has files " \
-                  "while rerun key '#{key_rerun}' also has recorded files."
-      output.puts '[specbandit] Refusing to run to avoid double-execution / undefined behavior.'
-      1
+    # Both the shared queue and this runner's rerun key hold files: the queue
+    # was re-pushed while this runner still carries rerun memory from a
+    # previous run (a full rerun). The stored memory is stale -- discard it
+    # and steal from the shared queue like a classic run, re-recording each
+    # stolen batch as we go.
+    def run_full_rerun
+      output.puts "[specbandit] Shared queue '#{key}' and rerun key '#{key_rerun}' both have files. " \
+                  "Full rerun: resetting '#{key_rerun}' and working from '#{key}'."
+      queue.delete(key_rerun)
+      run_steal(record: true)
     end
 
     # Replay mode: run a known list of files in local batches.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: specbandit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Ferran Basora