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

[CI] increase memory.max in cgroups.bats #4020

Merged
merged 1 commit into from
Sep 19, 2023

Conversation

lifubang
Copy link
Member

Fix #4019

As the description in #4019 :

  1. "runc run (cgroup v2 resources.unified only)"
    change the memory limit from 10MB to 20MB.
  2. "runc run (cgroup v2 resources.unified override)"
    ensure the memory limit in unified is bigger than .linux.resources.memory.limit.

@lifubang lifubang changed the title increase memory.max in cgroups.bats [CI] increase memory.max in cgroups.bats Sep 17, 2023
Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

SGTM

@AkihiroSuda AkihiroSuda merged commit 1614cab into opencontainers:main Sep 19, 2023
36 checks passed
@rata rata added the backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 label Oct 2, 2024
@kolyshkin kolyshkin added backport/1.1-done A PR in main branch which has been backported to release-1.1 and removed backport/1.1-todo A PR in main branch which needs to be backported to release-1.1 labels Oct 2, 2024
@lifubang lifubang deleted the fix-ci-cs9oom branch October 15, 2024 05:49
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lifubang <[email protected]>
@lifubang lifubang mentioned this pull request Oct 15, 2024
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lifubang [email protected]
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lifubang [email protected]
Signed-off-by: lfbzhm <[email protected]>
lifubang added a commit to lifubang/runc that referenced this pull request Oct 15, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lfbzhm <[email protected]>
lifubang added a commit to lifubang/runc that referenced this pull request Oct 18, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lfbzhm <[email protected]>
lifubang added a commit to lifubang/runc that referenced this pull request Oct 18, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lfbzhm <[email protected]>
kolyshkin pushed a commit to lifubang/runc that referenced this pull request Oct 21, 2024
This reverts commit 65a1074.

we need (opencontainers#4020) because of (opencontainers#3931), at that time, we removed the bindfd logic, and the
memfd logic will use more memory than before, but we have not yet moved binary clone from
runc init to runc parent process, so we need to increase memory limit in CI.
As we have moved the runc binary clone logic from runc init to runc parent process in
(opencontainers#3987), so the memory usage of binary clone will not be included in container's memory
cgroup accounting. Now we can support run a simple container with lower memory usage the
same as before.

Signed-off-by: lfbzhm <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci backport/1.1-done A PR in main branch which has been backported to release-1.1 easy-to-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[CI] flaky test: not ok 19 runc run (cgroup v2 resources.unified override)
5 participants