Revision eb5b61262929239e3a28eb67d20af2733f1095cd authored by Maria Khrustaleva on 25 March 2024, 11:07:54 UTC, committed by GitHub on 25 March 2024, 11:07:54 UTC
<!-- 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 <andrey@cvat.ai>
1 parent 33f9cc2
File | Mode | Size |
---|---|---|
server.conf | -rw-r--r-- | 1.4 KB |
utils.conf | -rw-r--r-- | 1.7 KB |
worker.analytics_reports.conf | -rw-r--r-- | 1.0 KB |
worker.annotation.conf | -rw-r--r-- | 1.0 KB |
worker.export.conf | -rw-r--r-- | 1.0 KB |
worker.import.conf | -rw-r--r-- | 1.3 KB |
worker.quality_reports.conf | -rw-r--r-- | 1.0 KB |
worker.webhooks.conf | -rw-r--r-- | 1.1 KB |
Computing file changes ...