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

Make memory calculator work with cgroups v2 #83

Merged
merged 2 commits into from
Aug 18, 2021

Conversation

lunar-consultancy
Copy link
Contributor

@lunar-consultancy lunar-consultancy commented Jul 23, 2021

Summary

Make memory calculator work with both cgroups v1 and v2

Use Cases

Docker 20.10 and containerd 1.4 implements cgroups v2. The memory limit file location has been moved to a new location eg /sys/fs/cgroup/memory/memory.limit_in_bytes -> /sys/fs/cgroup/memory.max

Checklist

  • I have viewed, signed, and submitted the Contributor License Agreement.
  • I have linked issue(s) that this PR should close using keywords or the Github UI (See docs)
  • I have added an integration test, if necessary.
  • I have reviewed the styleguide for guidance on my code quality.
  • I'm happy with the commit history on this PR (I have rebased/squashed as needed).

@lunar-consultancy lunar-consultancy requested a review from a team July 23, 2021 22:37
@dmikusa dmikusa added semver:minor A change requiring a minor version bump type:enhancement A general enhancement labels Jul 28, 2021
@dmikusa
Copy link
Contributor

dmikusa commented Aug 18, 2021

Sorry for the delay. It took me a little bit of time to set up a VM with cgroups v2. I did some testing. It worked great. Merging in.

@dmikusa dmikusa merged commit 43a36c4 into paketo-buildpacks:main Aug 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
semver:minor A change requiring a minor version bump type:enhancement A general enhancement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants