fix(move-to-finished): consider addition of prioritized jobs when processing last active job #2176
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
…cessing last active job
roggervalf
commented
Sep 10, 2023
tests/test_worker.ts
Outdated
| @@ -669,14 +669,44 @@ describe('workers', function () { | |||
| const worker = new Worker(queueName, processor, { connection }); | |||
| await worker.waitUntilReady(); | |||
|
|
|||
| // wait for all jobs to enter the queue and then start processing | |||
| await Promise.all([normalPriority, mediumPriority, highPriority]); | |||
|
|
|||
| await processing; | |||
There was a problem hiding this comment.
by awaiting this line is sufficient
manast
approved these changes
Sep 10, 2023
src/commands/moveToFinished-13.lua
Outdated
| if jobId then | ||
| if string.sub(jobId, 1, 2) == "0:" then | ||
| rcall("LREM", KEYS[2], 1, jobId) | ||
|
|
||
| -- If jobId is special ID 0:delay (delay grater than 0), then there is no job to process |
adiholden
reviewed
Sep 11, 2023
tests/test_worker.ts
Outdated
| @@ -669,14 +669,44 @@ describe('workers', function () { | |||
| const worker = new Worker(queueName, processor, { connection }); | |||
There was a problem hiding this comment.
@roggervalf I think that
await Promise.all([...normalPriority,...mediumPriority,...highPriority]);
should be added before creating a new worker, as you need to make sure that all jobs are entered before worker starts processing jobs.
When I run the test with this fixes the test failed as some jobs where added after the worker start processing.
There was a problem hiding this comment.
I see, probably in case of dragonfly its needed, ok let me add it back
roggervalf
deleted the
fix-prioritized-job-process-after-last-active
branch
github-actions bot
pushed a commit
that referenced
this pull request
Sep 12, 2023
# [4.10.0](v4.9.0...v4.10.0) (2023-09-12) ### Bug Fixes * **move-to-finished:** consider addition of prioritized jobs when processing last active job ([#2176](#2176)) (python) ([4b01f35](4b01f35)) * **remove:** change error message when job is locked (python) ([#2175](#2175)) ([2f5628f](2f5628f)) ### Features * **flow-producer:** add addBulk method (python) ([#2174](#2174)) ([c67dfb4](c67dfb4))
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.
No description provided.