Add ability to limit one user to one task at a time #6975
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
|
/check |
|
❌ Some checks failed |
Marishka17
changed the title
…hub.com/opencv/cvat into mk/limit_one_user_to_one_task_at_a_time
…hub.com/opencv/cvat into mk/limit_one_user_to_one_task_at_a_time
…hub.com/opencv/cvat into mk/limit_one_user_to_one_task_at_a_time
nmanovic
reviewed
Oct 25, 2023
.github/workflows/main.yml
Outdated
| @@ -174,6 +174,7 @@ jobs: | |||
| COVERAGE_PROCESS_START: ".coveragerc" | |||
| run: | | |||
| pytest tests/python/ --cov --cov-report=json | |||
| pytest tests/python/rest_api/test_rq_job_dependencies.py --rebuild --adjusted-server-conf --cov --cov-report=json | |||
There was a problem hiding this comment.
I expect something like
ONE_RUNNING_JOB_IN_QUEUE_PER_USER=true pytest tests/python/rest_api/test_rq_job_dependencies.py --rebuild --cov --cov-report=json
Need to check. I hope it will work.
There was a problem hiding this comment.
If we still need to override some settings in docker compose file, I'd rather to leave ONE_RUNNING_JOB_IN_QUEUE_PER_USER there
nmanovic
reviewed
Oct 25, 2023
nmanovic
reviewed
Oct 25, 2023
nmanovic
reviewed
Oct 25, 2023
tests/python/shared/fixtures/init.py
Outdated
| @@ -370,23 +376,27 @@ def session_start( | |||
| rebuild = session.config.getoption("--rebuild") | |||
| cleanup = session.config.getoption("--cleanup") | |||
| dumpdb = session.config.getoption("--dumpdb") | |||
There was a problem hiding this comment.
I hope you don't need changes in the file.
nmanovic
reviewed
Oct 26, 2023
|
@nmanovic, @zhiltsov-max, Do you have any other comments? |
changelog.d/20231023_132746_maria_limit_one_user_to_one_task_at_a_time.md
Outdated
Show resolved
Hide resolved
…hub.com/opencv/cvat into mk/limit_one_user_to_one_task_at_a_time
zhiltsov-max
approved these changes
Oct 27, 2023
Merged
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
Added ability to limit a user to one active rq job at a time.
Migrated to rq 1.15.1.
How has this been tested?
Manually + REST API test that will be in another PR
Checklist
developbranch- [ ] I have updated the documentation accordingly- [ ] I have added tests to cover my changes- [ ] I have linked related issues (see GitHub docs)- [ ] 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.