Skip to content

[Fix] PR re-reviews bypass debounce when an active review finishes #3607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
roomote-roomote wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

[Fix] PR re-reviews bypass debounce when an active review finishes #3607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
74a6b2a
fix(queue): preserve review debounce after scope handoff
daniel-lxs Oct 27, 2026
bba8594
Merge remote-tracking branch 'origin/develop' into fix/preserve-revie…
daniel-lxs Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions packages/cloud-agents/src/server/__tests__/task-run-queue.redis.test.ts
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 29 additions & 17 deletions packages/cloud-agents/src/server/task-run-queue.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ return evictedIds
const ATOMIC_DEQUEUE_SCRIPT = `
local queueLength = redis.call('LLEN', KEYS[1])
local lockTtlSeconds = tonumber(ARGV[1])
local nowMs = tonumber(ARGV[2])

for _ = 1, queueLength do
local entryId = redis.call('LPOP', KEYS[1])
Expand All @@ -269,24 +270,34 @@ for _ = 1, queueLength do
local entryScope = redis.call('HGET', KEYS[4], entryId)

if rawValue and entryScope then
local acquired = redis.call(
'SET',
entryScope,
entryId,
'EX',
lockTtlSeconds,
'NX'
)

if acquired then
redis.call('HDEL', KEYS[3], entryId)
redis.call('HDEL', KEYS[4], entryId)

if redis.call('HGET', KEYS[2], entryScope) == entryId then
redis.call('HDEL', KEYS[2], entryScope)
local decoded, entry = pcall(function() return cjson.decode(rawValue) end)
local availableAt = decoded and type(entry) == 'table' and tonumber(entry.availableAt) or nil
local delayMs = availableAt and math.ceil(availableAt - nowMs) or 0

-- An active owner's lock can prevent enqueue from installing its delay
-- marker. Releasing or expiring that lock must not bypass the deadline.
if delayMs > 0 then
redis.call('SET', entryScope, 'delay:' .. entryId, 'PX', delayMs, 'NX')
else
local acquired = redis.call(
'SET',
entryScope,
entryId,
'EX',
lockTtlSeconds,
'NX'
)

if acquired then
redis.call('HDEL', KEYS[3], entryId)
redis.call('HDEL', KEYS[4], entryId)

if redis.call('HGET', KEYS[2], entryScope) == entryId then
redis.call('HDEL', KEYS[2], entryScope)
end

return rawValue
end

return rawValue
end

redis.call('RPUSH', KEYS[1], entryId)
Expand Down Expand Up @@ -626,6 +637,7 @@ export class TaskRunQueue {
TaskRunQueueKeys.Entries,
TaskRunQueueKeys.EntryScopes,
Math.ceil(TASK_TIMEOUT_MS / 1000).toString(),
Date.now().toString(),
);

if (!rawValue) {
Expand Down
Loading