Fix CmdModifierTest#testMemoryLimitModified in cgroup2 environment.
#4375
Conversation
This file contains 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
cac03
force-pushed
the
cmd-modifier-test-cgroup2
branch
from
50b1920
to
f5c0864
Compare
|
Hi @cac03, Thanks for submitting a PR! I have an idea: |
|
Hi @bsideup !
I think that's cleaner solution Thank you for the hint! |
The `testMemoryLimitModified` was failing in cgroup2 environment because of the missing `/sys/fs/cgroup/memory/memory.limit_in_bytes` file. In the cgroup2 environment a new file should be checked instead -- `/sys/fs/cgroup/memory.max`. This commit intrdocues changes to `cat` both files: 1. `/sys/fs/cgroup/memory/memory.limit_in_bytes` from the first version of cgroup 2. `/sys/fs/cgroup/memory.max` from the second Similar issues: 1. oracle/docker-images#1939 2. apify/crawlee#693
cac03
force-pushed
the
cmd-modifier-test-cgroup2
branch
from
f5c0864
to
a8f45c7
Compare
|
@bsideup I've updated the PR Can you please take a look? |
rnorth
requested changes
Sep 7, 2021
docs/examples/junit4/generic/src/test/java/generic/CmdModifierTest.java
Outdated
Show resolved
Hide resolved
…edRedis.getDockerClient()`
rnorth
approved these changes
Sep 8, 2021
bsideup
approved these changes
Sep 14, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The
testMemoryLimitModifiedwas failing in cgroup2 environment because of the missing/sys/fs/cgroup/memory/memory.limit_in_bytesfile.In the cgroup2 environment a new file should be checked instead --
/sys/fs/cgroup/memory.max.This commit intrdocues changes to
catboth files:/sys/fs/cgroup/memory/memory.limit_in_bytesfrom the first version of cgroup/sys/fs/cgroup/memory.maxfrom the secondSimilar issues:
In the test both files are
catted, but only one of them will succeed.The attempt to
catthe other one result in an error added toExecResult#stderr.Is this acceptable in these tests?