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.

Sign up for GitHub

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

Jump to bottom

More fixes for automatic Docker limits #6982

Merged
merged 2 commits into from
Apr 28, 2020
Merged

More fixes for automatic Docker limits #6982

merged 2 commits into from
Apr 28, 2020

Conversation

agjohnson
Copy link
Contributor

  • 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
Fix usage of settings.DOCKER_LIMIT that was missed
ce8a509 
Tested on a build machine, looks better.
@agjohnson
Add another level of automatic docker limit configuration for AWS
65e1d72 
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 Pull request applied as hotfix to release label Apr 28, 2020
@agjohnson agjohnson mentioned this pull request Apr 28, 2020
Closed
3 tasks
@ericholscher ericholscher merged commit 456dd93 into master Apr 28, 2020
@ericholscher ericholscher deleted the hotfix/more-memory-limits branch April 28, 2020 23:35
humitos
humitos reviewed Apr 29, 2020
View reviewed changes
Copy link
Member

@humitos humitos left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Reviewers

@humitos humitos humitos approved these changes

@davidfischer davidfischer davidfischer approved these changes

@ericholscher ericholscher ericholscher approved these changes

Assignees
No one assigned
Labels
PR: hotfix Pull request applied as hotfix to release
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@agjohnson @ericholscher @davidfischer @humitos