Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More fixes for automatic Docker limits #6982

Merged
merged 2 commits into from Apr 28, 2020
Merged

Conversation

agjohnson
Copy link
Contributor

@agjohnson agjohnson commented Apr 28, 2020

  • Add another level of automatic docker limit configuration for AWS. This is a
    bit of a hack, as the memory limits are different on AWS, but the time should
    still be 3600s by default.
  • Fix usage of settings.DOCKER_LIMIT that was missed

agjohnson added 2 commits Apr 28, 2020
Tested on a build machine, looks better.
This is a bit of a hack, as the memory limits are different on AWS, but
the time should still be 3600s by default.
@agjohnson agjohnson added the PR: hotfix label Apr 28, 2020
@ericholscher ericholscher merged commit 456dd93 into master Apr 28, 2020
2 checks passed
@ericholscher ericholscher deleted the hotfix/more-memory-limits branch Apr 28, 2020
Copy link
Member

@humitos humitos left a comment

Will be good if we add a log.info at the end of this logic that shows what are the specific values set on DOCKER LIMITS together with what was the total_memory found dynamically.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: hotfix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants