Fix issues related to rq job dependencies #7139
Merged
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
… job registry due to AbandonedJobError
azhavoro
reviewed
Nov 15, 2023
cvat/settings/base.py
Outdated
|
|
||
| return job_ids | ||
|
|
||
| rq.registry.StartedJobRegistry.cleanup = custom_started_job_registry_cleanup |
There was a problem hiding this comment.
Please add a comment why we need override this method, and also add a link to the relevant issue
Marishka17
force-pushed
the
mk/fix_rq_issues
branch
from
060ca0c
to
70de4ab
Compare
Marishka17
changed the title
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #7139 +/- ##
===========================================
+ Coverage 81.48% 81.54% +0.05%
===========================================
Files 364 365 +1
Lines 39883 39923 +40
Branches 3702 3703 +1
===========================================
+ Hits 32499 32554 +55
+ Misses 7384 7369 -15
|
Marishka17
commented
Nov 16, 2023
|
Could you add a changelog entry? |
SpecLad
reviewed
Nov 23, 2023
|
|
||
| # NOTE: we should patch implementation of original method because | ||
| # there is no enqueuing dependent jobs in original function | ||
| # https://github.com/rq/rq/issues/2006 |
There was a problem hiding this comment.
Since you already have a fix, maybe you could submit it upstream? That way we could potentially remove this hack later (or maybe not apply it in the first place, depending on how quickly the maintainers respond).
SpecLad
reviewed
Nov 28, 2023
SpecLad
approved these changes
Dec 1, 2023
Merged
amjadsaadeh
pushed a commit
to amjadsaadeh/cvat
that referenced
this pull request
Dec 14, 2023
This PR resolves 2 issues related to rq jobs: 1. In some scenarios it is possible to reach a situation when `X2` rq job depends on `X1` -> running `X1` job is moved to FailedJobRegistry and not deleted -> user creates one more `X1` job that is enqueued after `X2` execution. It was possible due to the second issue when a user tried to export annotations for task 1, then for task 2, and after restarting the worker container user tried again to export annotations for task 1. (cyclic dependence) 2. Looks like in rq implementation rq jobs that depend on `X` job will never be enqueued when `X` is moved to FailedJobRegistry due to AbandonedJobError. I've submitted the [issue](rq/rq#2006) to the rq repository.
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.
Motivation and context
This PR resolves 2 issues related to rq jobs:
X2rq job depends onX1-> runningX1job is moved to FailedJobRegistry and not deleted -> user creates one moreX1job that is enqueued afterX2execution. It was possible due to the second issue when a user tried to export annotations for task 1, then for task 2, and after restarting the worker container user tried again to export annotations for task 1. (cyclic dependence)Xjob will never be enqueued whenXis moved to FailedJobRegistry due to AbandonedJobError. I've submitted the issue to the rq repository.How has this been tested?
Manually
Checklist
developbranch- [ ] I have updated the documentation accordingly- [ ] I have increased versions of npm packages if it is necessary(cvat-canvas,
cvat-core,
cvat-data and
cvat-ui)
License
Feel free to contact the maintainers if that's a concern.