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

[1.1]: Increase memory.max in cgroups.bats #4423

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

rata
Copy link
Member

@rata rata commented Oct 2, 2024

This is a backport of #4020 for 1.1.

When trying to create a release for 1.1, CI starting failing. This PR in main fixed it, so I'm backporting it.

Signed-off-by: lifubang <[email protected]>
(cherry picked from commit 65a1074)
@rata rata added the backport/1.1-pr A backport PR to release-1.1 label Oct 2, 2024
@rata rata mentioned this pull request Oct 2, 2024
@kolyshkin kolyshkin added this to the 1.1.15 milestone Oct 2, 2024
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

lgtm

@cpuguy83
Copy link
Contributor

cpuguy83 commented Oct 3, 2024

ping @AkihiroSuda

@AkihiroSuda AkihiroSuda merged commit a4cebd3 into opencontainers:release-1.1 Oct 3, 2024
28 checks passed
@rata rata deleted the 1-1-fix-CI branch October 8, 2024 14:42
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
As we will fix the race between binary clone and cgroup join, we can eliminate the
impacts of memory accounting from ensure_clone_binary. So runc will support lower memory
useage the same as before.

This reverts commit 719e2bc.
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
As we will fix the race between binary clone and cgroup join, we can eliminate the
impacts of memory accounting from ensure_clone_binary. So runc will support lower memory
useage the same as before.

This reverts commit 719e2bc.

Signed-off-by: lifubang <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.1-pr A backport PR to release-1.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants