-
Notifications
You must be signed in to change notification settings - Fork 414
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.
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
fix(dynamic-rate-limit): validate job lock cases #2975
Merged
+132
−68
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
--[[ | ||
Function to move job from active state to wait. | ||
Input: | ||
KEYS[1] active key | ||
KEYS[2] wait key | ||
|
||
KEYS[3] stalled key | ||
KEYS[4] paused key | ||
KEYS[5] meta key | ||
KEYS[6] limiter key | ||
KEYS[7] prioritized key | ||
KEYS[8] marker key | ||
KEYS[9] event key | ||
|
||
ARGV[1] job id | ||
ARGV[2] lock token | ||
ARGV[3] job id key | ||
]] | ||
local rcall = redis.call | ||
|
||
-- Includes | ||
--- @include "includes/addJobInTargetList" | ||
--- @include "includes/pushBackJobWithPriority" | ||
--- @include "includes/getOrSetMaxEvents" | ||
--- @include "includes/getTargetQueueList" | ||
--- @include "includes/removeLock" | ||
|
||
local jobId = ARGV[1] | ||
local token = ARGV[2] | ||
local jobKey = ARGV[3] | ||
|
||
local errorCode = removeLock(jobKey, KEYS[3], token, jobId) | ||
if errorCode < 0 then | ||
return errorCode | ||
end | ||
|
||
local metaKey = KEYS[5] | ||
local removed = rcall("LREM", KEYS[1], 1, jobId) | ||
if removed > 0 then | ||
local target, isPausedOrMaxed = getTargetQueueList(metaKey, KEYS[1], KEYS[2], KEYS[4]) | ||
|
||
local priority = tonumber(rcall("HGET", ARGV[3], "priority")) or 0 | ||
|
||
if priority > 0 then | ||
pushBackJobWithPriority(KEYS[7], priority, jobId) | ||
else | ||
addJobInTargetList(target, KEYS[8], "RPUSH", isPausedOrMaxed, jobId) | ||
end | ||
|
||
local maxEvents = getOrSetMaxEvents(metaKey) | ||
|
||
-- Emit waiting event | ||
rcall("XADD", KEYS[9], "MAXLEN", "~", maxEvents, "*", "event", "waiting", | ||
"jobId", jobId) | ||
end | ||
|
||
local pttl = rcall("PTTL", KEYS[6]) | ||
|
||
if pttl > 0 then | ||
return pttl | ||
else | ||
return 0 | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why can't we generate the key here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removeLock include concats lock suffix to jobKey that is passed as an argv, so no need to pass lockKey