Skip to content

kuberuntime: Fix tests on machines with IsCgroup2UnifiedMode true #119145

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.

Sign up for GitHub

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

Jump to bottom
Closed
wants to merge 1 commit into from
Closed

kuberuntime: Fix tests on machines with IsCgroup2UnifiedMode true #119145

wants to merge 1 commit into from

Conversation

ahmedtd
Copy link
Contributor

@ahmedtd ahmedtd commented Jul 7, 2023

On a machine where libcontainercgroups.IsCgroup2UnifiedMode() returns true (whatever that means), several tests in kuberuntime will consistently fail because they don't account for the hardcoded "memory.oom.group": "1" entry we add to the unified resource map.

This commit fixes these tests by checking for this entry in the output. If it exists, it is added to the expected output before diffing.

/kind bug
/kind failing-test

NONE

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/bug Categorizes issue or PR as related to a bug. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jul 7, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @ahmedtd. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Jul 7, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ahmedtd
Once this PR has been reviewed and has the lgtm label, please assign mrunalp for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@carlory
Copy link
Member

carlory commented Jul 7, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jul 7, 2023
@haircommander
Copy link
Contributor

hm I guess we weren't running unit tests on cgroup v2

/lgtm

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2023
haircommander
haircommander reviewed Jul 7, 2023
View reviewed changes
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 7, 2023
@haircommander
Copy link
Contributor

/triage accepted
/priority important-soon

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Jul 7, 2023
@ahmedtd
kuberuntime: Fix tests on machines with IsCgroup2UnifiedMode true
a60f8e6 
On a machine where libcontainercgroups.IsCgroup2UnifiedMode() returns
true (whatever that means), several tests in kuberuntime will
consistently fail because they don't account for the hardcoded
"memory.oom.group": "1" entry we add to the unified resource map.

This commit fixes these tests by checking for this entry in the output.
If it exists, it is added to the expected output before diffing.
@ahmedtd ahmedtd force-pushed the kuberuntime-cgroup-test branch from 8bc828e to a60f8e6 Compare July 7, 2023 17:23
@tzneal tzneal mentioned this pull request Jul 12, 2023
Closed
@tzneal
Copy link
Contributor

tzneal commented Jul 12, 2023

#119233 fixes this as well and seems a bit more straight forward.

@harche
Copy link
Contributor

harche commented Jul 12, 2023

/test pull-kubernetes-node-crio-cgrpv2-e2e
/test pull-kubernetes-cos-cgroupv2-containerd-node-e2e
/test pull-kubernetes-cos-cgroupv2-containerd-node-e2e-features

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Jul 19, 2023
@k8s-ci-robot
Copy link
Contributor

PR needs rebase.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@SergeyKanzhelev
Copy link
Member

/assign @ffromani

need to decide which approach is better comparing with #119329

@tzneal
Copy link
Contributor

tzneal commented Jul 21, 2023

I confirmed this was fixed with #118764 . I believe this PR can be closed.

@bart0sh
Copy link
Contributor

bart0sh commented Jul 23, 2023

/close

@k8s-ci-robot
Copy link
Contributor

@bart0sh: Closed this PR.

In response to this:

/close

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@haircommander haircommander Awaiting requested review from haircommander

Assignees

@haircommander haircommander

@ffromani ffromani

Labels
area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
SIG Node CI/Test Board
Archived in project
SIG Node: code and documentation PRs
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@ahmedtd @k8s-ci-robot @carlory @haircommander @tzneal @harche @SergeyKanzhelev @bart0sh @ffromani