fix(dynamic-rate-limit): validate job lock cases #2975
Merged
+132
−68
Conversation
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
manast
reviewed
Dec 19, 2024
| @@ -1387,13 +1387,11 @@ export class Scripts { | |||
| */ | |||
| async moveJobFromActiveToWait(jobId: string, token: string) { | |||
| const client = await this.queue.client; | |||
| const lockKey = `${this.queue.toKey(jobId)}:lock`; | |||
There was a problem hiding this comment.
why can't we generate the key here?
There was a problem hiding this comment.
removeLock include concats lock suffix to jobKey that is passed as an argv, so no need to pass lockKey
| local pttl = rcall("PTTL", KEYS[7]) | ||
| if lockToken == token then | ||
| local metaKey = KEYS[6] | ||
| if rcall("EXISTS", jobKey) == 1 then |
There was a problem hiding this comment.
I think we should be able to skip checking for the key existence as we need to read the token anyway, and it will return an empty string or nil if the key does not exist.
There was a problem hiding this comment.
as we don't expose this method to be used when using manual processing we should be good skipping it. For other methods like moveToComplete or moveToFailed is still needed as when passing token '0' we basically ignore that check
roggervalf
force-pushed
the
fix-dynamic-rate-limit
branch
from
4cdb8a9 to
8e0214f
Compare
roggervalf
changed the title
github-actions bot
pushed a commit
that referenced
this pull request
Dec 25, 2024
## [5.34.5](v5.34.4...v5.34.5) (2024-12-25) ### Bug Fixes * **dynamic-rate-limit:** validate job lock cases ([#2975](#2975)) ([8bb27ea](8bb27ea))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Validate existente of job when dynamic rate límit is used. Upgrade cron-parser to fix a vulnerability as well