Commit 79b064b
authored
Fix
* Fix `CmdModifierTest#testMemoryLimitModified` in cgroup2 environment.
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
* Use `docker info` to distinguish cgroup version
* Use `DockerClientFactory.instance().client()` instead of `memoryLimitedRedis.getDockerClient()`CmdModifierTest#testMemoryLimitModified in cgroup2 environment. (#4375)1 parent 8746f20 commit 79b064b
File tree
1 file changed
+16
-1
lines changed- docs/examples/junit4/generic/src/test/java/generic
1 file changed
+16
-1
lines changedLines changed: 16 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
| 3 | + | |
| 4 | + | |
3 | 5 | | |
4 | 6 | | |
| 7 | + | |
5 | 8 | | |
6 | 9 | | |
7 | 10 | | |
8 | 11 | | |
9 | 12 | | |
| 13 | + | |
10 | 14 | | |
11 | 15 | | |
12 | 16 | | |
| |||
39 | 43 | | |
40 | 44 | | |
41 | 45 | | |
42 | | - | |
| 46 | + | |
43 | 47 | | |
44 | 48 | | |
| 49 | + | |
| 50 | + | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
45 | 60 | | |
0 commit comments