Move logic for downloading resources from CS into main background process #7551
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
Marishka17
force-pushed
the
mk/fix_logic_for_importing_resources_from_cs
branch
from
d95cbce to
df9690d
Compare
Marishka17
changed the title
|
/check |
|
✔️ All checks completed successfully |
Marishka17
changed the title
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## develop #7551 +/- ##
========================================
Coverage 83.44% 83.45%
========================================
Files 373 373
Lines 39724 39716 -8
Branches 3741 3741
========================================
- Hits 33147 33144 -3
+ Misses 6577 6572 -5
|
azhavoro
approved these changes
Mar 19, 2024
g-kartik
pushed a commit
to g-kartik/cvat
that referenced
this pull request
Mar 29, 2024
…cess (cvat-ai#7551) <!-- Raise an issue to propose your change (https://github.com/opencv/cvat/issues). It helps to avoid duplication of efforts from multiple independent contributors. Discuss your ideas with maintainers to be sure that changes will be approved and merged. Read the [Contribution guide](https://opencv.github.io/cvat/docs/contributing/). --> <!-- Provide a general summary of your changes in the Title above --> ### Motivation and context <!-- Why is this change required? What problem does it solve? If it fixes an open issue, please link to the issue here. Describe your changes in detail, add screenshots. --> Looks like using dependent jobs for downloading resources from cloud storage gives more problems than benefits. With such architecture, it is possible to stop the import queue forever. E.g. RQ_1 process for downloading file from CS fails -> dependent RQ_2 process for importing file will not be started ([1](https://github.dev/rq/rq/blob/3ad86083c33ec28b81a07f94dafdcf1cd56429ea/rq/worker.py#L1562), [2](https://github.dev/rq/rq/blob/3ad86083c33ec28b81a07f94dafdcf1cd56429ea/rq/worker.py#L691-L692)) (it means that this process will be kept in the deferred registry forever since there is no code that cleans the deferred registry + for some reason such jobs are not moved to the failed registry after dependencies fail) -> next request for importing something creates new RQ job dependent from RQ_2. This PR fixes the described issue. ### How has this been tested? <!-- Please describe in detail how you tested your changes. Include details of your testing environment, and the tests you ran to see how your change affects other areas of the code, etc. --> Manually ### Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. If an item isn't applicable for some reason, then ~~explicitly strikethrough~~ the whole line. If you don't do that, GitHub will show incorrect progress for the pull request. If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [x] I submit my changes into the `develop` branch - [ ] I have created a changelog fragment <!-- see top comment in CHANGELOG.md --> - [ ] I have updated the documentation accordingly - [ ] I have added tests to cover my changes - [ ] I have linked related issues (see [GitHub docs]( https://help.github.com/en/github/managing-your-work-on-github/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)) ~~- [ ] I have increased versions of npm packages if it is necessary ([cvat-canvas](https://github.com/opencv/cvat/tree/develop/cvat-canvas#versioning), [cvat-core](https://github.com/opencv/cvat/tree/develop/cvat-core#versioning), [cvat-data](https://github.com/opencv/cvat/tree/develop/cvat-data#versioning) and [cvat-ui](https://github.com/opencv/cvat/tree/develop/cvat-ui#versioning))~~ ### License - [x] I submit _my code changes_ under the same [MIT License]( https://github.com/opencv/cvat/blob/develop/LICENSE) that covers the project. Feel free to contact the maintainers if that's a concern. --------- Co-authored-by: Andrey Zhavoronkov <[email protected]>
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
Looks like using dependent jobs for downloading resources from cloud storage gives more problems than benefits. With such architecture, it is possible to stop the import queue forever. E.g. RQ_1 process for downloading file from CS fails -> dependent RQ_2 process for importing file will not be started (1, 2) (it means that this process will be kept in the deferred registry forever since there is no code that cleans the deferred registry + for some reason such jobs are not moved to the failed registry after dependencies fail) -> next request for importing something creates new RQ job dependent from RQ_2. This PR fixes the described issue.
How has this been tested?
Manually
Checklist
developbranch- [ ] 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.