Move docker limits back to setting #7023
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
This setting was moved to a constant, which was harder to override and replicated a lot of the same logic we had for settings. We hit a number of issues around the DOCKER_LIMITS setting existing, and these constants not being used, etc. This hard codes a memory limit, which would be used for dev environments outside Docker, and perhaps tests. Limits are 1g memory and 600s build time -- up from 200m memory limit that is too small. Production guessing of memory/time will be in ops settings now.
This will require two small changes for these additional settings.
stsewd
reviewed
May 5, 2020
readthedocs/settings/base.py
Outdated
| 'memory': '1g', | ||
| 'time': 600, | ||
| } | ||
| if self.RTD_IS_PRODUCTION: |
There was a problem hiding this comment.
What about just checking for DEBUG?
There was a problem hiding this comment.
Yea, I don't like adding a new setting for this, we already have enough settings that we should be able to figure out one that is good for this.
3 tasks
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.
This setting was moved to a constant, which was harder to override and
replicated a lot of the same logic we had for settings. We hit a number
of issues around the DOCKER_LIMITS setting existing, and these constants
not being used, etc.
This hard codes a memory limit, which would be used for dev
environments outside Docker, and perhaps tests. Limits are 1g memory
and 600s build time -- up from 200m memory limit that is too small.
Production guessing of memory/time will be in ops settings now.
Refs #6983