Fix TestUpdateContainerResources_Memory* on cgroup v2 hosts #7893
Conversation
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
Fix issue 7890
Tested on Ubuntu 22.10, with swapon and swapoff:
```
$ GITHUB_WORKSPACE="" ENABLE_CRI_SANDBOXES="" CONTAINERD_RUNTIME=io.containerd.runc.v2 FOCUS=TestUpdateContainerResources_Memory make cri-integration
...
=== RUN TestUpdateContainerResources_MemorySwap
container_update_resources_test.go:161: Create a sandbox
INFO[0000] Using the following image list: {Alpine:docker.io/library/alpine:latest BusyBox:docker.io/library/busybox:latest Pause:registry.k8s.io/pause:3.8 ResourceConsumer:registry.k8s.io/e2e-test-images/resource-consumer:1.10 VolumeCopyUp:ghcr.io/containerd/volume-copy-up:2.1 VolumeOwnership:ghcr.io/containerd/volume-ownership:2.1}
main_test.go:663: Image "registry.k8s.io/pause:3.8" already exists, not pulling.
container_update_resources_test.go:174: Create a container with memory limit but no swap
container_update_resources_test.go:186: Check memory limit in container OCI spec
container_update_resources_test.go:194: Check memory limit in container OCI spec
container_update_resources_test.go:200: Start the container
container_update_resources_test.go:205: Check memory limit in cgroup
container_update_resources_test.go:211: Update container memory limit after started
container_update_resources_test.go:217: Check memory limit in container OCI spec
container_update_resources_test.go:222: Check memory limit in cgroup
--- PASS: TestUpdateContainerResources_MemorySwap (0.88s)
=== RUN TestUpdateContainerResources_MemoryLimit
container_update_resources_test.go:228: Create a sandbox
main_test.go:663: Image "registry.k8s.io/pause:3.8" already exists, not pulling.
container_update_resources_test.go:238: Create a container with memory limit
container_update_resources_test.go:249: Check memory limit in container OCI spec
container_update_resources_test.go:257: Update container memory limit after created
container_update_resources_test.go:263: Check memory limit in container OCI spec
container_update_resources_test.go:269: Start the container
container_update_resources_test.go:274: Check memory limit in cgroup
container_update_resources_test.go:280: Update container memory limit after started
container_update_resources_test.go:286: Check memory limit in container OCI spec
container_update_resources_test.go:292: Check memory limit in cgroup
--- PASS: TestUpdateContainerResources_MemoryLimit (0.91s)
PASS
```
Signed-off-by: Akihiro Suda <[email protected]>
AkihiroSuda
added
area/cri
dmcgowan
approved these changes
Jan 2, 2023
dcantah
approved these changes
Jan 3, 2023
thaJeztah
added
cherry-picked/1.6.x
kiashok
added a commit
to kiashok/containerd
that referenced
this pull request
Oct 23, 2024
… main Updates ADO containerd fork-external/main with upstream containerd main @commit hash: f9f8455 containerd@f9f8455 Additional changes in the PR: - update linux container image version - remove copying LICENSE file in shared-build-stages.yml - additions to .gdnsuppress Related work items: containerd#5674, containerd#7393, containerd#7661, containerd#7685, containerd#7810, containerd#7850, containerd#7861, containerd#7879, containerd#7880, containerd#7881, containerd#7882, containerd#7883, containerd#7886, containerd#7887, containerd#7888, containerd#7891, containerd#7892, containerd#7893, containerd#7894, containerd#7903, containerd#7904, containerd#7905, containerd#7906, containerd#7907, containerd#7908, containerd#7911, containerd#7913, containerd#7914, containerd#7917, containerd#7925, containerd#7927, containerd#7928, containerd#7929, containerd#7932, containerd#7935, containerd#7943, containerd#7946, containerd#7948, containerd#7957, containerd#7958, containerd#7960, containerd#7963, containerd#7969, containerd#7970, containerd#7973
kiashok
added a commit
to kiashok/containerd
that referenced
this pull request
Oct 23, 2024
…/main Update fork-external/main with upstream containerd/containerd/main at commit hash 3d32da8 Related work items: containerd#5674, containerd#7129, containerd#7393, containerd#7661, containerd#7685, containerd#7810, containerd#7850, containerd#7861, containerd#7882, containerd#7883, containerd#7886, containerd#7891, containerd#7892, containerd#7893, containerd#7903, containerd#7904, containerd#7905, containerd#7906, containerd#7907, containerd#7908, containerd#7911, containerd#7913, containerd#7914, containerd#7917, containerd#7925, containerd#7927, containerd#7928, containerd#7929, containerd#7932, containerd#7935, containerd#7943, containerd#7946, containerd#7948, containerd#7957, containerd#7958, containerd#7959, containerd#7960, containerd#7963, containerd#7968, containerd#7969, containerd#7970, containerd#7973, containerd#7985, containerd#7987, containerd#7994, containerd#8005
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fix #7890
Tested on Ubuntu 22.10, with swapon and swapoff: