Commit 177ebd5
authored
feat: renew in-flight job timestamps via a worker heartbeat (#17)
* feat: renew in-flight job timestamps via a worker heartbeat
Long-running jobs could be executed twice from a single enqueue. When a
handler runs longer than `stalledThreshold`, the stalled-recovery path
re-delivers it to a free slot because nothing ever refreshes `acquiredAt`
between claim and completion — so the threshold acts as a hard cap on job
runtime rather than a crash-detection window.
Add a heartbeat that periodically renews the acquired timestamp of jobs
currently in the pool:
- `renewJobs(queue, jobIds)` on the Adapter contract, implemented for the
Redis (Lua `HSET` over the active hash), Knex (UPDATE ... WHERE status =
'active'), Fake and Sync adapters. Only entries still active are renewed,
so a job that was already recovered or finalized is never resurrected by
a late heartbeat.
- A dedicated worker `setInterval` (~`stalledThreshold / 2`) that renews the
in-flight job ids. It must be a separate timer: at full concurrency the
process loop blocks on `waitForNextCompletion()` with no idle tick, so the
loop is not cycling exactly when long jobs are in flight.
- The heartbeat is cleared in `stop()` (after draining, so jobs that are
still finishing keep being renewed until they complete) as well as in the
process() generator's `finally`, guaranteeing deterministic cleanup whether
the worker was driven via start() or processCycle(). `#startHeartbeat` is
idempotent so the timer can never leak if the loop is re-entered.
"Stalled" now means the worker actually died again, so `stalledThreshold`
can stay small without re-delivering healthy long-running jobs.
Tests cover renewJobs across all adapters (renew keeps an active job from
recovery, never resurrects an already-recovered job, is queue-scoped) and
two worker-level tests: a long-running job at full capacity is renewed by
the heartbeat and executes exactly once, and the heartbeat stops firing once
the worker is stopped.
* fix: only renew job leases owned by the calling worker
renewJobs previously checked only that a job was still active (HEXISTS),
so a slow-but-alive worker whose job had been recovered and re-acquired
by another worker would keep renewing the new owner's lease — preventing
recovery from re-delivering it if that owner later died.
Enforce ownership using the worker id the adapter already holds from
setWorkerId (as pop does), without changing the renewJobs signature:
- Redis: RENEW_JOBS_SCRIPT skips entries whose workerId doesn't match.
- Knex: renew UPDATE gains a WHERE worker_id clause.
- Fake/memory adapters: record the worker id on pop and filter on it.
Add a cross-worker driver test asserting a worker cannot renew a lease
owned by another worker, while the legitimate owner still can.1 parent 4a576a3 commit 177ebd5
12 files changed
Lines changed: 547 additions & 43 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
90 | 90 | | |
91 | 91 | | |
92 | 92 | | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
93 | 111 | | |
94 | 112 | | |
95 | 113 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
28 | 28 | | |
29 | 29 | | |
30 | 30 | | |
| 31 | + | |
31 | 32 | | |
32 | 33 | | |
33 | 34 | | |
| |||
81 | 82 | | |
82 | 83 | | |
83 | 84 | | |
| 85 | + | |
84 | 86 | | |
85 | 87 | | |
86 | 88 | | |
| |||
94 | 96 | | |
95 | 97 | | |
96 | 98 | | |
97 | | - | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
98 | 102 | | |
99 | 103 | | |
100 | 104 | | |
| |||
240 | 244 | | |
241 | 245 | | |
242 | 246 | | |
243 | | - | |
| 247 | + | |
244 | 248 | | |
245 | 249 | | |
246 | 250 | | |
| |||
345 | 349 | | |
346 | 350 | | |
347 | 351 | | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
348 | 367 | | |
349 | 368 | | |
350 | 369 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
630 | 630 | | |
631 | 631 | | |
632 | 632 | | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
| 644 | + | |
| 645 | + | |
| 646 | + | |
| 647 | + | |
| 648 | + | |
| 649 | + | |
| 650 | + | |
| 651 | + | |
| 652 | + | |
633 | 653 | | |
634 | 654 | | |
635 | 655 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
404 | 405 | | |
405 | 406 | | |
406 | 407 | | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
407 | 428 | | |
408 | 429 | | |
409 | 430 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
401 | 401 | | |
402 | 402 | | |
403 | 403 | | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
404 | 435 | | |
405 | 436 | | |
406 | 437 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
110 | 110 | | |
111 | 111 | | |
112 | 112 | | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
113 | 118 | | |
114 | 119 | | |
115 | 120 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| 70 | + | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
| 78 | + | |
| 79 | + | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
| 84 | + | |
| 85 | + | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
70 | 94 | | |
71 | 95 | | |
72 | 96 | | |
| |||
0 commit comments