This repository was archived by the owner on Oct 13, 2023. It is now read-only.
[18.09 backport] Do not enable kmem on RHEL7 kernels#115
Closed
thaJeztah wants to merge 6 commits into
Closed
Conversation
Signed-off-by: John Howard <jhoward@microsoft.com> This removes the need for an SVM in the LCOW driver to ApplyDiff. This change relates to a fix for moby#36353 However, it found another issue, tracked by moby#37955 (cherry picked from commit bde9996) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit d03ab10) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Changes: opencontainers/runc@69663f0...a00bf01 Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp> (cherry picked from commit 275044b) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit dd7799a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Changes: opencontainers/runc@a00bf01...9f1e944 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 335736f) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Member
Author
|
This only partially addresses the issue; the runc/containerd packaging scripts have to be updated accordingly, as those are used to build the |
In case we're running on RHEL7 kernel, which has non-working and broken kernel memory controller, add 'nokmem' build tag so that runc never enables kmem accounting. For more info, see the following runc commit: opencontainers/runc@6a2c1559684 This behavior can be overriden by having `RUNC_NOKMEM` environment variable set (e.g. to empty value to disable setting nokmem). Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com> (cherry picked from commit 8972aa9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
18.09_backport_runc
branch
from
8486ea1 to
433fa0a
Compare
Member
Author
|
force pushed to trigger CI, as Jenkins results were purged |
|
this fix is already included in #121 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
backport of moby#38128 for 18.09
depends on #106, so this PR was built on top of that; only the last two commits are new
1. bump runc
Changes: opencontainers/runc@a00bf01...9f1e944
This is primarily to pull in opencontainers/runc#1921
2. runc.installer: add nokmem build tag for rhel7 kernel
In case we're running on RHEL7 kernel, which has non-working
and broken kernel memory controller, add 'nokmem' build tag
so that runc never enables kmem accounting.
For more info, see the following runc commit:
opencontainers/runc@6a2c1559684
This behavior can be overriden by having
RUNC_NOKMEMenvironmentvariable set (e.g. to empty value to disable setting nokmem).