-
Notifications
You must be signed in to change notification settings - Fork 214
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: avoid collisions in auto-generated Job IDs causing dropped jobs #237
Open
hughsw
wants to merge
5
commits into
bee-queue:master
Choose a base branch
from
hughsw:fix-dropped-jobs-uuid
base: master
Could not load branches
Branch not found: {{ refName }}
Could not load tags
Nothing to show
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
41bb008
fix(lost-jobs): Jobs get early uuid assignment (#78, #189)
hughsw f6a1d1a
fix(lost-jobs/testing): Tests use job.id; make a removeJob test be de…
hughsw a843829
fix: avoid collisions of auto-generated job IDs
compwright c62edc4
Merge branch 'master' into fix-dropped-jobs-uuid
compwright bfbd4ea
Merge branch 'master' into fix-dropped-jobs-uuid
compwright File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
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 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,13 @@ | ||
--[[ | ||
key 1 -> bq:name:id (job ID counter) | ||
key 1 -> bq:name:id (job counter) | ||
key 2 -> bq:name:jobs | ||
key 3 -> bq:name:waiting | ||
arg 1 -> job id | ||
arg 2 -> job data | ||
]] | ||
|
||
local jobId = ARGV[1] | ||
if jobId == "" then | ||
jobId = "" .. redis.call("incr", KEYS[1]) | ||
end | ||
if redis.call("hexists", KEYS[2], jobId) == 1 then return nil end | ||
if redis.call("hexists", KEYS[2], jobId) == 1 then return end | ||
if KEYS[1] then redis.call("incr", KEYS[1]) end | ||
redis.call("hset", KEYS[2], jobId, ARGV[2]) | ||
redis.call("lpush", KEYS[3], jobId) | ||
|
||
return jobId |
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
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.
What is stored in
bq:name:id
? My understanding from this PR is that it's the number of jobs that don't have a custom id? What's that used for?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.
I believe that is correct, it's poorly named, and appears to come from the fact that auto-generated IDs are currently sequential. So job ID 1000 would be the 1000th job. This PR of course changes that but does not rename to try to maximize compatibility, replacing the stat with the actual count instead of the actual last job ID from which you would infer the count.
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.
Where is that information ("the number of jobs that don't have a custom id") used?