bullmq 2.2.0 → 2.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/classes/job.d.ts +1 -1
- package/dist/cjs/classes/redis-connection.d.ts +6 -2
- package/dist/cjs/classes/redis-connection.js +12 -5
- package/dist/cjs/classes/redis-connection.js.map +1 -1
- package/dist/cjs/scripts/addJob-8.d.ts +5 -0
- package/dist/{esm/commands/addJob-8.lua → cjs/scripts/addJob-8.js} +83 -31
- package/dist/cjs/scripts/addJob-8.js.map +1 -0
- package/dist/cjs/scripts/changeDelay-4.d.ts +5 -0
- package/dist/cjs/{commands/changeDelay-4.lua → scripts/changeDelay-4.js} +11 -11
- package/dist/cjs/scripts/changeDelay-4.js.map +1 -0
- package/dist/cjs/scripts/cleanJobsInSet-2.d.ts +5 -0
- package/dist/cjs/scripts/cleanJobsInSet-2.js +264 -0
- package/dist/cjs/scripts/cleanJobsInSet-2.js.map +1 -0
- package/dist/cjs/scripts/drain-4.d.ts +5 -0
- package/dist/cjs/{commands/includes/removeParentDependencyKey.lua → scripts/drain-4.js} +110 -10
- package/dist/cjs/scripts/drain-4.js.map +1 -0
- package/dist/cjs/scripts/extendLock-2.d.ts +5 -0
- package/dist/{esm/commands/extendLock-2.lua → cjs/scripts/extendLock-2.js} +11 -4
- package/dist/cjs/scripts/extendLock-2.js.map +1 -0
- package/dist/cjs/scripts/getState-7.d.ts +5 -0
- package/dist/{esm/commands/getState-7.lua → cjs/scripts/getState-7.js} +22 -12
- package/dist/cjs/scripts/getState-7.js.map +1 -0
- package/dist/cjs/scripts/getStateV2-7.d.ts +5 -0
- package/dist/cjs/{commands/getStateV2-7.lua → scripts/getStateV2-7.js} +11 -10
- package/dist/cjs/scripts/getStateV2-7.js.map +1 -0
- package/dist/cjs/scripts/index.d.ts +26 -0
- package/dist/cjs/scripts/index.js +30 -0
- package/dist/cjs/scripts/index.js.map +1 -0
- package/dist/cjs/scripts/isFinished-3.d.ts +5 -0
- package/dist/cjs/{commands/isFinished-3.lua → scripts/isFinished-3.js} +11 -10
- package/dist/cjs/scripts/isFinished-3.js.map +1 -0
- package/dist/cjs/scripts/isJobInList-1.d.ts +5 -0
- package/dist/cjs/scripts/isJobInList-1.js +32 -0
- package/dist/cjs/scripts/isJobInList-1.js.map +1 -0
- package/dist/cjs/scripts/moveStalledJobsToWait-8.d.ts +5 -0
- package/dist/cjs/scripts/moveStalledJobsToWait-8.js +291 -0
- package/dist/cjs/scripts/moveStalledJobsToWait-8.js.map +1 -0
- package/dist/cjs/scripts/moveToActive-9.d.ts +5 -0
- package/dist/cjs/scripts/moveToActive-9.js +207 -0
- package/dist/cjs/scripts/moveToActive-9.js.map +1 -0
- package/dist/cjs/scripts/moveToDelayed-5.d.ts +5 -0
- package/dist/cjs/{commands/moveToDelayed-5.lua → scripts/moveToDelayed-5.js} +11 -13
- package/dist/cjs/scripts/moveToDelayed-5.js.map +1 -0
- package/dist/cjs/scripts/moveToFinished-12.d.ts +5 -0
- package/dist/cjs/scripts/moveToFinished-12.js +538 -0
- package/dist/cjs/scripts/moveToFinished-12.js.map +1 -0
- package/dist/cjs/scripts/moveToWaitingChildren-4.d.ts +5 -0
- package/dist/cjs/{commands/moveToWaitingChildren-4.lua → scripts/moveToWaitingChildren-4.js} +11 -14
- package/dist/cjs/scripts/moveToWaitingChildren-4.js.map +1 -0
- package/dist/cjs/scripts/obliterate-2.d.ts +5 -0
- package/dist/cjs/scripts/obliterate-2.js +241 -0
- package/dist/cjs/scripts/obliterate-2.js.map +1 -0
- package/dist/cjs/scripts/pause-4.d.ts +5 -0
- package/dist/{esm/commands/pause-4.lua → cjs/scripts/pause-4.js} +11 -7
- package/dist/cjs/scripts/pause-4.js.map +1 -0
- package/dist/cjs/scripts/promote-6.d.ts +5 -0
- package/dist/cjs/{commands/promote-6.lua → scripts/promote-6.js} +22 -14
- package/dist/cjs/scripts/promote-6.js.map +1 -0
- package/dist/cjs/scripts/releaseLock-1.d.ts +5 -0
- package/dist/{esm/commands/releaseLock-1.lua → cjs/scripts/releaseLock-1.js} +11 -5
- package/dist/cjs/scripts/releaseLock-1.js.map +1 -0
- package/dist/cjs/scripts/removeJob-1.d.ts +5 -0
- package/dist/cjs/scripts/removeJob-1.js +206 -0
- package/dist/cjs/scripts/removeJob-1.js.map +1 -0
- package/dist/cjs/scripts/removeRepeatable-2.d.ts +5 -0
- package/dist/cjs/{commands/removeRepeatable-2.lua → scripts/removeRepeatable-2.js} +11 -7
- package/dist/cjs/scripts/removeRepeatable-2.js.map +1 -0
- package/dist/cjs/scripts/reprocessJob-4.d.ts +5 -0
- package/dist/{esm/commands/reprocessJob-4.lua → cjs/scripts/reprocessJob-4.js} +11 -5
- package/dist/cjs/scripts/reprocessJob-4.js.map +1 -0
- package/dist/cjs/scripts/retryJob-6.d.ts +5 -0
- package/dist/{esm/commands/retryJob-6.lua → cjs/scripts/retryJob-6.js} +22 -13
- package/dist/cjs/scripts/retryJob-6.js.map +1 -0
- package/dist/cjs/scripts/retryJobs-6.d.ts +5 -0
- package/dist/cjs/{commands/retryJobs-6.lua → scripts/retryJobs-6.js} +38 -15
- package/dist/cjs/scripts/retryJobs-6.js.map +1 -0
- package/dist/cjs/scripts/takeLock-1.d.ts +5 -0
- package/dist/cjs/{commands/takeLock-1.lua → scripts/takeLock-1.js} +11 -4
- package/dist/cjs/scripts/takeLock-1.js.map +1 -0
- package/dist/cjs/scripts/updateData-1.d.ts +5 -0
- package/dist/cjs/scripts/updateData-1.js +23 -0
- package/dist/cjs/scripts/updateData-1.js.map +1 -0
- package/dist/cjs/scripts/updateProgress-2.d.ts +5 -0
- package/dist/{esm/commands/updateProgress-2.lua → cjs/scripts/updateProgress-2.js} +11 -5
- package/dist/cjs/scripts/updateProgress-2.js.map +1 -0
- package/dist/esm/classes/job.d.ts +1 -1
- package/dist/esm/classes/redis-connection.d.ts +6 -2
- package/dist/esm/classes/redis-connection.js +12 -5
- package/dist/esm/classes/redis-connection.js.map +1 -1
- package/dist/esm/scripts/addJob-8.d.ts +5 -0
- package/dist/{cjs/commands/addJob-8.lua → esm/scripts/addJob-8.js} +80 -31
- package/dist/esm/scripts/addJob-8.js.map +1 -0
- package/dist/esm/scripts/changeDelay-4.d.ts +5 -0
- package/dist/esm/{commands/changeDelay-4.lua → scripts/changeDelay-4.js} +8 -11
- package/dist/esm/scripts/changeDelay-4.js.map +1 -0
- package/dist/esm/scripts/cleanJobsInSet-2.d.ts +5 -0
- package/dist/esm/scripts/cleanJobsInSet-2.js +261 -0
- package/dist/esm/scripts/cleanJobsInSet-2.js.map +1 -0
- package/dist/esm/scripts/drain-4.d.ts +5 -0
- package/dist/esm/{commands/includes/removeParentDependencyKey.lua → scripts/drain-4.js} +107 -10
- package/dist/esm/scripts/drain-4.js.map +1 -0
- package/dist/esm/scripts/extendLock-2.d.ts +5 -0
- package/dist/{cjs/commands/extendLock-2.lua → esm/scripts/extendLock-2.js} +8 -4
- package/dist/esm/scripts/extendLock-2.js.map +1 -0
- package/dist/esm/scripts/getState-7.d.ts +5 -0
- package/dist/{cjs/commands/getState-7.lua → esm/scripts/getState-7.js} +19 -12
- package/dist/esm/scripts/getState-7.js.map +1 -0
- package/dist/esm/scripts/getStateV2-7.d.ts +5 -0
- package/dist/esm/{commands/getStateV2-7.lua → scripts/getStateV2-7.js} +8 -10
- package/dist/esm/scripts/getStateV2-7.js.map +1 -0
- package/dist/esm/scripts/index.d.ts +26 -0
- package/dist/esm/scripts/index.js +27 -0
- package/dist/esm/scripts/index.js.map +1 -0
- package/dist/esm/scripts/isFinished-3.d.ts +5 -0
- package/dist/esm/{commands/isFinished-3.lua → scripts/isFinished-3.js} +8 -10
- package/dist/esm/scripts/isFinished-3.js.map +1 -0
- package/dist/esm/scripts/isJobInList-1.d.ts +5 -0
- package/dist/esm/scripts/isJobInList-1.js +29 -0
- package/dist/esm/scripts/isJobInList-1.js.map +1 -0
- package/dist/esm/scripts/moveStalledJobsToWait-8.d.ts +5 -0
- package/dist/esm/scripts/moveStalledJobsToWait-8.js +288 -0
- package/dist/esm/scripts/moveStalledJobsToWait-8.js.map +1 -0
- package/dist/esm/scripts/moveToActive-9.d.ts +5 -0
- package/dist/esm/scripts/moveToActive-9.js +204 -0
- package/dist/esm/scripts/moveToActive-9.js.map +1 -0
- package/dist/esm/scripts/moveToDelayed-5.d.ts +5 -0
- package/dist/esm/{commands/moveToDelayed-5.lua → scripts/moveToDelayed-5.js} +8 -13
- package/dist/esm/scripts/moveToDelayed-5.js.map +1 -0
- package/dist/esm/scripts/moveToFinished-12.d.ts +5 -0
- package/dist/esm/scripts/moveToFinished-12.js +535 -0
- package/dist/esm/scripts/moveToFinished-12.js.map +1 -0
- package/dist/esm/scripts/moveToWaitingChildren-4.d.ts +5 -0
- package/dist/esm/{commands/moveToWaitingChildren-4.lua → scripts/moveToWaitingChildren-4.js} +8 -14
- package/dist/esm/scripts/moveToWaitingChildren-4.js.map +1 -0
- package/dist/esm/scripts/obliterate-2.d.ts +5 -0
- package/dist/esm/scripts/obliterate-2.js +238 -0
- package/dist/esm/scripts/obliterate-2.js.map +1 -0
- package/dist/esm/scripts/pause-4.d.ts +5 -0
- package/dist/{cjs/commands/pause-4.lua → esm/scripts/pause-4.js} +8 -7
- package/dist/esm/scripts/pause-4.js.map +1 -0
- package/dist/esm/scripts/promote-6.d.ts +5 -0
- package/dist/esm/{commands/promote-6.lua → scripts/promote-6.js} +19 -14
- package/dist/esm/scripts/promote-6.js.map +1 -0
- package/dist/esm/scripts/releaseLock-1.d.ts +5 -0
- package/dist/{cjs/commands/releaseLock-1.lua → esm/scripts/releaseLock-1.js} +8 -5
- package/dist/esm/scripts/releaseLock-1.js.map +1 -0
- package/dist/esm/scripts/removeJob-1.d.ts +5 -0
- package/dist/esm/scripts/removeJob-1.js +203 -0
- package/dist/esm/scripts/removeJob-1.js.map +1 -0
- package/dist/esm/scripts/removeRepeatable-2.d.ts +5 -0
- package/dist/esm/{commands/removeRepeatable-2.lua → scripts/removeRepeatable-2.js} +8 -7
- package/dist/esm/scripts/removeRepeatable-2.js.map +1 -0
- package/dist/esm/scripts/reprocessJob-4.d.ts +5 -0
- package/dist/{cjs/commands/reprocessJob-4.lua → esm/scripts/reprocessJob-4.js} +8 -5
- package/dist/esm/scripts/reprocessJob-4.js.map +1 -0
- package/dist/esm/scripts/retryJob-6.d.ts +5 -0
- package/dist/{cjs/commands/retryJob-6.lua → esm/scripts/retryJob-6.js} +19 -13
- package/dist/esm/scripts/retryJob-6.js.map +1 -0
- package/dist/esm/scripts/retryJobs-6.d.ts +5 -0
- package/dist/esm/{commands/retryJobs-6.lua → scripts/retryJobs-6.js} +35 -15
- package/dist/esm/scripts/retryJobs-6.js.map +1 -0
- package/dist/esm/scripts/takeLock-1.d.ts +5 -0
- package/dist/esm/{commands/takeLock-1.lua → scripts/takeLock-1.js} +8 -4
- package/dist/esm/scripts/takeLock-1.js.map +1 -0
- package/dist/esm/scripts/updateData-1.d.ts +5 -0
- package/dist/esm/{commands/updateData-1.lua → scripts/updateData-1.js} +8 -4
- package/dist/esm/scripts/updateData-1.js.map +1 -0
- package/dist/esm/scripts/updateProgress-2.d.ts +5 -0
- package/dist/{cjs/commands/updateProgress-2.lua → esm/scripts/updateProgress-2.js} +8 -5
- package/dist/esm/scripts/updateProgress-2.js.map +1 -0
- package/package.json +4 -2
- package/dist/cjs/commands/cleanJobsInSet-2.lua +0 -46
- package/dist/cjs/commands/drain-4.lua +0 -25
- package/dist/cjs/commands/includes/addJobWithPriority.lua +0 -16
- package/dist/cjs/commands/includes/batches.lua +0 -18
- package/dist/cjs/commands/includes/checkItemInList.lua +0 -12
- package/dist/cjs/commands/includes/checkStalledJobs.lua +0 -137
- package/dist/cjs/commands/includes/cleanList.lua +0 -50
- package/dist/cjs/commands/includes/cleanSet.lua +0 -50
- package/dist/cjs/commands/includes/collectMetrics.lua +0 -46
- package/dist/cjs/commands/includes/destructureJobKey.lua +0 -12
- package/dist/cjs/commands/includes/getNextDelayedTimestamp.lua +0 -13
- package/dist/cjs/commands/includes/getTargetQueueList.lua +0 -12
- package/dist/cjs/commands/includes/getTimestamp.lua +0 -19
- package/dist/cjs/commands/includes/getZSetItems.lua +0 -7
- package/dist/cjs/commands/includes/isLocked.lua +0 -31
- package/dist/cjs/commands/includes/moveJobFromWaitToActive.lua +0 -84
- package/dist/cjs/commands/includes/moveParentFromWaitingChildrenToFailed.lua +0 -25
- package/dist/cjs/commands/includes/promoteDelayedJobs.lua +0 -49
- package/dist/cjs/commands/includes/removeJob.lua +0 -13
- package/dist/cjs/commands/includes/removeJobFromAnyState.lua +0 -26
- package/dist/cjs/commands/includes/removeJobs.lua +0 -38
- package/dist/cjs/commands/includes/removeJobsByMaxAge.lua +0 -15
- package/dist/cjs/commands/includes/removeJobsByMaxCount.lua +0 -15
- package/dist/cjs/commands/includes/trimEvents.lua +0 -12
- package/dist/cjs/commands/includes/updateParentDepsIfNeeded.lua +0 -28
- package/dist/cjs/commands/isJobInList-1.lua +0 -16
- package/dist/cjs/commands/moveStalledJobsToWait-8.lua +0 -24
- package/dist/cjs/commands/moveToActive-9.lua +0 -67
- package/dist/cjs/commands/moveToFinished-12.lua +0 -201
- package/dist/cjs/commands/obliterate-2.lua +0 -94
- package/dist/cjs/commands/removeJob-1.lua +0 -72
- package/dist/cjs/commands/updateData-1.lua +0 -16
- package/dist/esm/commands/cleanJobsInSet-2.lua +0 -46
- package/dist/esm/commands/drain-4.lua +0 -25
- package/dist/esm/commands/includes/addJobWithPriority.lua +0 -16
- package/dist/esm/commands/includes/batches.lua +0 -18
- package/dist/esm/commands/includes/checkItemInList.lua +0 -12
- package/dist/esm/commands/includes/checkStalledJobs.lua +0 -137
- package/dist/esm/commands/includes/cleanList.lua +0 -50
- package/dist/esm/commands/includes/cleanSet.lua +0 -50
- package/dist/esm/commands/includes/collectMetrics.lua +0 -46
- package/dist/esm/commands/includes/destructureJobKey.lua +0 -12
- package/dist/esm/commands/includes/getNextDelayedTimestamp.lua +0 -13
- package/dist/esm/commands/includes/getTargetQueueList.lua +0 -12
- package/dist/esm/commands/includes/getTimestamp.lua +0 -19
- package/dist/esm/commands/includes/getZSetItems.lua +0 -7
- package/dist/esm/commands/includes/isLocked.lua +0 -31
- package/dist/esm/commands/includes/moveJobFromWaitToActive.lua +0 -84
- package/dist/esm/commands/includes/moveParentFromWaitingChildrenToFailed.lua +0 -25
- package/dist/esm/commands/includes/promoteDelayedJobs.lua +0 -49
- package/dist/esm/commands/includes/removeJob.lua +0 -13
- package/dist/esm/commands/includes/removeJobFromAnyState.lua +0 -26
- package/dist/esm/commands/includes/removeJobs.lua +0 -38
- package/dist/esm/commands/includes/removeJobsByMaxAge.lua +0 -15
- package/dist/esm/commands/includes/removeJobsByMaxCount.lua +0 -15
- package/dist/esm/commands/includes/trimEvents.lua +0 -12
- package/dist/esm/commands/includes/updateParentDepsIfNeeded.lua +0 -28
- package/dist/esm/commands/isJobInList-1.lua +0 -16
- package/dist/esm/commands/moveStalledJobsToWait-8.lua +0 -24
- package/dist/esm/commands/moveToActive-9.lua +0 -67
- package/dist/esm/commands/moveToFinished-12.lua +0 -201
- package/dist/esm/commands/obliterate-2.lua +0 -94
- package/dist/esm/commands/removeJob-1.lua +0 -72
@@ -1,201 +0,0 @@
|
|
1
|
-
--[[
|
2
|
-
Move job from active to a finished status (completed o failed)
|
3
|
-
A job can only be moved to completed if it was active.
|
4
|
-
The job must be locked before it can be moved to a finished status,
|
5
|
-
and the lock must be released in this script.
|
6
|
-
|
7
|
-
Input:
|
8
|
-
KEYS[1] wait key
|
9
|
-
KEYS[2] active key
|
10
|
-
KEYS[3] priority key
|
11
|
-
KEYS[4] event stream key
|
12
|
-
KEYS[5] stalled key
|
13
|
-
|
14
|
-
-- Rate limiting
|
15
|
-
KEYS[6] rate limiter key
|
16
|
-
KEYS[7] delayed key
|
17
|
-
|
18
|
-
KEYS[8] paused key
|
19
|
-
|
20
|
-
KEYS[9] completed/failed key
|
21
|
-
KEYS[10] jobId key
|
22
|
-
KEYS[11] meta key
|
23
|
-
KEYS[12] metrics key
|
24
|
-
|
25
|
-
ARGV[1] jobId
|
26
|
-
ARGV[2] timestamp
|
27
|
-
ARGV[3] msg property returnvalue / failedReason
|
28
|
-
ARGV[4] return value / failed reason
|
29
|
-
ARGV[5] target (completed/failed)
|
30
|
-
ARGV[6] event data (? maybe just send jobid).
|
31
|
-
ARGV[7] fetch next?
|
32
|
-
ARGV[8] keys prefix
|
33
|
-
ARGV[9] opts
|
34
|
-
|
35
|
-
opts - token - lock token
|
36
|
-
opts - keepJobs
|
37
|
-
opts - lockDuration - lock duration in milliseconds
|
38
|
-
opts - parent - parent data
|
39
|
-
opts - parentKey
|
40
|
-
opts - attempts max attempts
|
41
|
-
opts - attemptsMade
|
42
|
-
opts - maxMetricsSize
|
43
|
-
opts - fpof - fail parent on fail
|
44
|
-
|
45
|
-
Output:
|
46
|
-
0 OK
|
47
|
-
-1 Missing key.
|
48
|
-
-2 Missing lock.
|
49
|
-
-3 Job not in active set
|
50
|
-
-4 Job has pending dependencies
|
51
|
-
|
52
|
-
Events:
|
53
|
-
'completed/failed'
|
54
|
-
]]
|
55
|
-
local rcall = redis.call
|
56
|
-
|
57
|
-
--- Includes
|
58
|
-
--- @include "includes/collectMetrics"
|
59
|
-
--- @include "includes/getNextDelayedTimestamp"
|
60
|
-
--- @include "includes/moveJobFromWaitToActive"
|
61
|
-
--- @include "includes/moveParentFromWaitingChildrenToFailed"
|
62
|
-
--- @include "includes/promoteDelayedJobs"
|
63
|
-
--- @include "includes/removeJobsByMaxAge"
|
64
|
-
--- @include "includes/removeJobsByMaxCount"
|
65
|
-
--- @include "includes/trimEvents"
|
66
|
-
--- @include "includes/updateParentDepsIfNeeded"
|
67
|
-
|
68
|
-
local jobIdKey = KEYS[10]
|
69
|
-
if rcall("EXISTS", jobIdKey) == 1 then -- // Make sure job exists
|
70
|
-
local opts = cmsgpack.unpack(ARGV[9])
|
71
|
-
|
72
|
-
local token = opts['token']
|
73
|
-
local parentId = opts['parent'] and opts['parent']['id'] or ""
|
74
|
-
local parentQueueKey = opts['parent'] and opts['parent']['queue'] or ""
|
75
|
-
local parentKey = opts['parentKey'] or ""
|
76
|
-
local attempts = opts['attempts']
|
77
|
-
local attemptsMade = opts['attemptsMade']
|
78
|
-
local maxMetricsSize = opts['maxMetricsSize']
|
79
|
-
local maxCount = opts['keepJobs']['count']
|
80
|
-
local maxAge = opts['keepJobs']['age']
|
81
|
-
|
82
|
-
if token ~= "0" then
|
83
|
-
local lockKey = jobIdKey .. ':lock'
|
84
|
-
if rcall("GET", lockKey) == token then
|
85
|
-
rcall("DEL", lockKey)
|
86
|
-
rcall("SREM", KEYS[5], ARGV[1])
|
87
|
-
else
|
88
|
-
return -2
|
89
|
-
end
|
90
|
-
end
|
91
|
-
|
92
|
-
if rcall("SCARD", jobIdKey .. ":dependencies") ~= 0 then -- // Make sure it does not have pending dependencies
|
93
|
-
return -4
|
94
|
-
end
|
95
|
-
|
96
|
-
local jobId = ARGV[1]
|
97
|
-
local timestamp = ARGV[2]
|
98
|
-
|
99
|
-
-- Remove from active list (if not active we shall return error)
|
100
|
-
local numRemovedElements = rcall("LREM", KEYS[2], -1, jobId)
|
101
|
-
|
102
|
-
if (numRemovedElements < 1) then return -3 end
|
103
|
-
|
104
|
-
-- Trim events before emiting them to avoid trimming events emitted in this script
|
105
|
-
trimEvents(KEYS[11], KEYS[4])
|
106
|
-
|
107
|
-
-- If job has a parent we need to
|
108
|
-
-- 1) remove this job id from parents dependencies
|
109
|
-
-- 2) move the job Id to parent "processed" set
|
110
|
-
-- 3) push the results into parent "results" list
|
111
|
-
-- 4) if parent's dependencies is empty, then move parent to "wait/paused". Note it may be a different queue!.
|
112
|
-
if parentId == "" and parentKey ~= "" then
|
113
|
-
parentId = getJobIdFromKey(parentKey)
|
114
|
-
parentQueueKey = getJobKeyPrefix(parentKey, ":" .. parentId)
|
115
|
-
end
|
116
|
-
if parentId ~= "" then
|
117
|
-
if ARGV[5] == "completed" then
|
118
|
-
local dependenciesSet = parentKey .. ":dependencies"
|
119
|
-
if rcall("SREM", dependenciesSet, jobIdKey) == 1 then
|
120
|
-
updateParentDepsIfNeeded(parentKey, parentQueueKey, dependenciesSet,
|
121
|
-
parentId, jobIdKey, ARGV[4])
|
122
|
-
end
|
123
|
-
elseif opts['fpof'] then
|
124
|
-
moveParentFromWaitingChildrenToFailed(parentQueueKey, parentKey, parentId, jobIdKey, timestamp)
|
125
|
-
end
|
126
|
-
end
|
127
|
-
|
128
|
-
-- Remove job?
|
129
|
-
if maxCount ~= 0 then
|
130
|
-
local targetSet = KEYS[9]
|
131
|
-
-- Add to complete/failed set
|
132
|
-
rcall("ZADD", targetSet, timestamp, jobId)
|
133
|
-
rcall("HMSET", jobIdKey, ARGV[3], ARGV[4], "finishedOn", timestamp)
|
134
|
-
-- "returnvalue" / "failedReason" and "finishedOn"
|
135
|
-
|
136
|
-
-- Remove old jobs?
|
137
|
-
local prefix = ARGV[8]
|
138
|
-
|
139
|
-
if maxAge ~= nil then
|
140
|
-
removeJobsByMaxAge(timestamp, maxAge, targetSet, prefix)
|
141
|
-
end
|
142
|
-
|
143
|
-
if maxCount ~= nil and maxCount > 0 then
|
144
|
-
removeJobsByMaxCount(maxCount, targetSet, prefix)
|
145
|
-
end
|
146
|
-
else
|
147
|
-
rcall("DEL", jobIdKey, jobIdKey .. ':logs', jobIdKey .. ':processed')
|
148
|
-
end
|
149
|
-
|
150
|
-
rcall("XADD", KEYS[4], "*", "event", ARGV[5], "jobId", jobId, ARGV[3],
|
151
|
-
ARGV[4])
|
152
|
-
|
153
|
-
if ARGV[5] == "failed" then
|
154
|
-
if tonumber(attemptsMade) >= tonumber(attempts) then
|
155
|
-
rcall("XADD", KEYS[4], "*", "event", "retries-exhausted", "jobId",
|
156
|
-
jobId, "attemptsMade", attemptsMade)
|
157
|
-
end
|
158
|
-
end
|
159
|
-
|
160
|
-
-- Collect metrics
|
161
|
-
if maxMetricsSize ~= "" then
|
162
|
-
collectMetrics(KEYS[12], KEYS[12]..':data', maxMetricsSize, timestamp)
|
163
|
-
end
|
164
|
-
|
165
|
-
-- Try to get next job to avoid an extra roundtrip if the queue is not closing,
|
166
|
-
-- and not rate limited.
|
167
|
-
if (ARGV[7] == "1") then
|
168
|
-
|
169
|
-
-- Check if there are delayed jobs that can be promoted
|
170
|
-
promoteDelayedJobs(KEYS[7], KEYS[1], KEYS[3], KEYS[8], KEYS[11], KEYS[4], ARGV[8], timestamp)
|
171
|
-
|
172
|
-
jobId = rcall("RPOPLPUSH", KEYS[1], KEYS[2])
|
173
|
-
|
174
|
-
if jobId == "0" then
|
175
|
-
rcall("LREM", KEYS[2], 1, 0)
|
176
|
-
elseif jobId then
|
177
|
-
return moveJobFromWaitToActive(KEYS, ARGV[8], jobId, timestamp, opts)
|
178
|
-
end
|
179
|
-
|
180
|
-
-- Return the timestamp for the next delayed job if any.
|
181
|
-
local nextTimestamp = getNextDelayedTimestamp(KEYS[7])
|
182
|
-
if (nextTimestamp ~= nil) then
|
183
|
-
-- The result is guaranteed to be positive, since the
|
184
|
-
-- ZRANGEBYSCORE command would have return a job otherwise.
|
185
|
-
return nextTimestamp - timestamp
|
186
|
-
end
|
187
|
-
end
|
188
|
-
|
189
|
-
local waitLen = rcall("LLEN", KEYS[1])
|
190
|
-
if waitLen == 0 then
|
191
|
-
local activeLen = rcall("LLEN", KEYS[2])
|
192
|
-
|
193
|
-
if activeLen == 0 then
|
194
|
-
rcall("XADD", KEYS[4], "*", "event", "drained")
|
195
|
-
end
|
196
|
-
end
|
197
|
-
|
198
|
-
return 0
|
199
|
-
else
|
200
|
-
return -1
|
201
|
-
end
|
@@ -1,94 +0,0 @@
|
|
1
|
-
--[[
|
2
|
-
Completely obliterates a queue and all of its contents
|
3
|
-
|
4
|
-
Input:
|
5
|
-
KEYS[1] meta
|
6
|
-
KEYS[2] base
|
7
|
-
|
8
|
-
ARGV[1] count
|
9
|
-
ARGV[2] force
|
10
|
-
]]
|
11
|
-
|
12
|
-
-- This command completely destroys a queue including all of its jobs, current or past
|
13
|
-
-- leaving no trace of its existence. Since this script needs to iterate to find all the job
|
14
|
-
-- keys, consider that this call may be slow for very large queues.
|
15
|
-
|
16
|
-
-- The queue needs to be "paused" or it will return an error
|
17
|
-
-- If the queue has currently active jobs then the script by default will return error,
|
18
|
-
-- however this behaviour can be overrided using the 'force' option.
|
19
|
-
local maxCount = tonumber(ARGV[1])
|
20
|
-
local baseKey = KEYS[2]
|
21
|
-
|
22
|
-
local rcall = redis.call
|
23
|
-
|
24
|
-
--- @include "includes/removeJobs"
|
25
|
-
|
26
|
-
local function removeLockKeys(keys)
|
27
|
-
for i, key in ipairs(keys) do
|
28
|
-
rcall("DEL", baseKey .. key .. ':lock')
|
29
|
-
end
|
30
|
-
end
|
31
|
-
|
32
|
-
-- 1) Check if paused, if not return with error.
|
33
|
-
if rcall("HEXISTS", KEYS[1], "paused") ~= 1 then
|
34
|
-
return -1 -- Error, NotPaused
|
35
|
-
end
|
36
|
-
|
37
|
-
-- 2) Check if there are active jobs, if there are and not "force" return error.
|
38
|
-
local activeKey = baseKey .. 'active'
|
39
|
-
local activeJobs = getListItems(activeKey, maxCount)
|
40
|
-
if (#activeJobs > 0) then
|
41
|
-
if(ARGV[2] == "") then
|
42
|
-
return -2 -- Error, ExistActiveJobs
|
43
|
-
end
|
44
|
-
end
|
45
|
-
|
46
|
-
removeLockKeys(activeJobs)
|
47
|
-
maxCount = removeJobs(activeJobs, true, baseKey, maxCount)
|
48
|
-
rcall("LTRIM", activeKey, #activeJobs, -1)
|
49
|
-
if(maxCount <= 0) then
|
50
|
-
return 1
|
51
|
-
end
|
52
|
-
|
53
|
-
local delayedKey = baseKey .. 'delayed'
|
54
|
-
maxCount = removeZSetJobs(delayedKey, true, baseKey, maxCount)
|
55
|
-
if(maxCount <= 0) then
|
56
|
-
return 1
|
57
|
-
end
|
58
|
-
|
59
|
-
local completedKey = baseKey .. 'completed'
|
60
|
-
maxCount = removeZSetJobs(completedKey, true, baseKey, maxCount)
|
61
|
-
if(maxCount <= 0) then
|
62
|
-
return 1
|
63
|
-
end
|
64
|
-
|
65
|
-
local waitKey = baseKey .. 'paused'
|
66
|
-
maxCount = removeListJobs(waitKey, true, baseKey, maxCount)
|
67
|
-
if(maxCount <= 0) then
|
68
|
-
return 1
|
69
|
-
end
|
70
|
-
|
71
|
-
local failedKey = baseKey .. 'failed'
|
72
|
-
maxCount = removeZSetJobs(failedKey, true, baseKey, maxCount)
|
73
|
-
if(maxCount <= 0) then
|
74
|
-
return 1
|
75
|
-
end
|
76
|
-
|
77
|
-
if(maxCount > 0) then
|
78
|
-
rcall("DEL",
|
79
|
-
baseKey .. 'priority',
|
80
|
-
baseKey .. 'events',
|
81
|
-
baseKey .. 'delay',
|
82
|
-
baseKey .. 'stalled-check',
|
83
|
-
baseKey .. 'stalled',
|
84
|
-
baseKey .. 'id',
|
85
|
-
baseKey .. 'meta',
|
86
|
-
baseKey .. 'repeat',
|
87
|
-
baseKey .. 'metrics:completed',
|
88
|
-
baseKey .. 'metrics:completed:data',
|
89
|
-
baseKey .. 'metrics:failed',
|
90
|
-
baseKey .. 'metrics:failed:data')
|
91
|
-
return 0
|
92
|
-
else
|
93
|
-
return 1
|
94
|
-
end
|
@@ -1,72 +0,0 @@
|
|
1
|
-
--[[
|
2
|
-
Remove a job from all the queues it may be in as well as all its data.
|
3
|
-
In order to be able to remove a job, it cannot be active.
|
4
|
-
|
5
|
-
Input:
|
6
|
-
KEYS[1] queue prefix
|
7
|
-
ARGV[1] jobId
|
8
|
-
|
9
|
-
Events:
|
10
|
-
'removed'
|
11
|
-
]]
|
12
|
-
|
13
|
-
local rcall = redis.call
|
14
|
-
|
15
|
-
-- Includes
|
16
|
-
--- @include "includes/destructureJobKey"
|
17
|
-
--- @include "includes/isLocked"
|
18
|
-
--- @include "includes/removeJobFromAnyState"
|
19
|
-
--- @include "includes/removeParentDependencyKey"
|
20
|
-
|
21
|
-
local function removeJob( prefix, jobId, parentKey)
|
22
|
-
local jobKey = prefix .. jobId;
|
23
|
-
|
24
|
-
removeParentDependencyKey(jobKey, false, parentKey)
|
25
|
-
|
26
|
-
-- Check if this job has children
|
27
|
-
-- If so, we are going to try to remove the children recursively in deep first way because
|
28
|
-
-- if some job is locked we must exit with and error.
|
29
|
-
--local countProcessed = rcall("HLEN", jobKey .. ":processed")
|
30
|
-
local processed = rcall("HGETALL", jobKey .. ":processed")
|
31
|
-
|
32
|
-
if (#processed > 0) then
|
33
|
-
for i = 1, #processed, 2 do
|
34
|
-
local childJobId = getJobIdFromKey(processed[i])
|
35
|
-
local childJobPrefix = getJobKeyPrefix(processed[i], childJobId)
|
36
|
-
removeJob( childJobPrefix, childJobId, jobKey )
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
local dependencies = rcall("SMEMBERS", jobKey .. ":dependencies")
|
41
|
-
if (#dependencies > 0) then
|
42
|
-
for i, childJobKey in ipairs(dependencies) do
|
43
|
-
-- We need to get the jobId for this job.
|
44
|
-
local childJobId = getJobIdFromKey(childJobKey)
|
45
|
-
local childJobPrefix = getJobKeyPrefix(childJobKey, childJobId)
|
46
|
-
removeJob( childJobPrefix, childJobId, jobKey )
|
47
|
-
end
|
48
|
-
end
|
49
|
-
|
50
|
-
local prev = removeJobFromAnyState(prefix, jobId)
|
51
|
-
|
52
|
-
rcall("ZREM", prefix .. "priority", jobId)
|
53
|
-
rcall("DEL", jobKey, jobKey .. ":logs", jobKey .. ":dependencies", jobKey .. ":processed")
|
54
|
-
|
55
|
-
-- -- delete keys related to rate limiter
|
56
|
-
-- local limiterIndexTable = KEYS[10] .. ":index"
|
57
|
-
-- local limitedSetKey = rcall("HGET", limiterIndexTable, jobId)
|
58
|
-
-- if limitedSetKey then
|
59
|
-
-- rcall("SREM", limitedSetKey, jobId)
|
60
|
-
-- rcall("HDEL", limiterIndexTable, jobId)
|
61
|
-
-- end
|
62
|
-
|
63
|
-
rcall("XADD", prefix .. "events", "*", "event", "removed", "jobId", jobId, "prev", prev);
|
64
|
-
end
|
65
|
-
|
66
|
-
local prefix = KEYS[1]
|
67
|
-
|
68
|
-
if not isLocked(prefix, ARGV[1]) then
|
69
|
-
removeJob(prefix, ARGV[1])
|
70
|
-
return 1
|
71
|
-
end
|
72
|
-
return 0
|