Skip to content

Convert watchStuckJobs implementation to use SCAN instead of KEYS #1174

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
taywrobel wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Convert watchStuckJobs implementation to use SCAN instead of KEYS #1174

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 15 additions & 11 deletions lib/kue.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,19 +278,23 @@ Queue.prototype.watchStuckJobs = function( ms ) {
prefix = '{' + prefix + '}';
}
var script =
'local msg = redis.call( "keys", "' + prefix + ':jobs:*:inactive" )\n\
'local cursor = "0"\n\
local need_fix = 0\n\
for i,v in ipairs(msg) do\n\
local queue = redis.call( "zcard", v )\n\
local jt = string.match(v, "' + prefix + ':jobs:(.*):inactive")\n\
local pending = redis.call( "LLEN", "' + prefix + ':" .. jt .. ":jobs" )\n\
if queue > pending then\n\
need_fix = need_fix + 1\n\
for j=1,(queue-pending) do\n\
redis.call( "lpush", "' + prefix + ':"..jt..":jobs", 1 )\n\
repeat\n\
local window = redis.call( "scan", cursor, "match", "' + prefix + ':jobs:*:inactive", "COUNT", "100")\n\
cursor = window[1]\n\
for i,v in ipairs(window[2]) do\n\
local queue = redis.call( "zcard", v )\n\
local jt = string.match(v, "' + prefix + ':jobs:(.*):inactive")\n\
local pending = redis.call( "LLEN", "' + prefix + ':" .. jt .. ":jobs" )\n\
if queue > pending then\n\
need_fix = need_fix + 1\n\
for j=1,(queue-pending) do\n\
redis.call( "lpush", "' + prefix + ':"..jt..":jobs", 1 )\n\
end\n\
end\n\
end\n\
end\n\
end\n\
until (cursor == "0")\n\
return need_fix';
clearInterval(this.stuck_job_watch);
client.script('LOAD', script, function( err, sha ) {
Expand Down