Limit concurrency per-organization #7489
Merged
Conversation
This file contains hidden or 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
Allow us to limit concurrency per-organization besides per-project. Both limits are compatible and can be used together, giving more priority to the limits per-project. This means we can limit a whole organization to 10 concurrent builds but a particular project from the organization could be limited to only 2.
readthedocs/builds/querysets.py
Outdated
| max_concurrent = project.max_concurrent_builds or settings.RTD_MAX_CONCURRENT_BUILDS | ||
| max_concurrent = ( | ||
| project.max_concurrent_builds or | ||
| (organization.max_concurrent_builds if organization else 0) or |
There was a problem hiding this comment.
Do we want else 0 here? Will the 0 cause the or to move to the default? It seems a bit confusing.
There was a problem hiding this comment.
Yes, this may be a little tricky. Basically the 0 here works as False and makes the or to continue to the next value:
In [27]: None or 0 or 5
Out[27]: 5
This QuerySet takes into account the project limit, then the organization limit and finally the default setting. Using a QuerySet allows us to extend it from corporate and use `Plan.max_concurrent_builds` field.
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.
Allow us to limit concurrency per-organization besides per-project. Both limits are compatible and can be used together, giving more priority to the limits per-project. This means we can limit a whole organization to 10 concurrent builds but a particular project from the organization could be limited to only 2.