[release-4.14] OCPBUGS-60961: UPSTREAM: <carry>: kubelet/cm: fix bug where kubelet restarts from missing cpuset cgroup #2431
Conversation
…ssing cpuset cgroup on None cpumanager policy, cgroupv2, and systemd cgroup manager, kubelet could get into a situation where it believes the cpuset cgroup was created (by libcontainer in the cgroupfs) but systemd has deleted it, as it wasn't requested to create it. This causes one unnecessary restart, as kubelet fails with `failed to initialize top level QOS containers: root container [kubepods] doesn't exist.` This only causes one restart because the kubelet skips recreating the cgroup if it already exists, but it's still a bother and is fixed this way adapted version of kubernetes@c51195d, avoid merge conflict this can be dropped in the 4.19 rebase Signed-off-by: Peter Hunt <pehunt@redhat.com>
Adapted from kubernetes@77d03e4 to avoid merge conflict This can be dropped in the 4.19 rebase Authored-by: Francesco Romani <fromani@redhat.com> Signed-off-by: Peter Hunt <pehunt@redhat.com>
with systemd cgroup driver and cpumanager none policy. This was originally planned to be a correctness check for https://issues.k8s.io/125923, but it was difficult to reproduce the bug, so it's now a regression test against it. Signed-off-by: Francesco Romani <fromani@redhat.com> Signed-off-by: Peter Hunt <pehunt@redhat.com>
Signed-off-by: Peter Hunt <pehunt@redhat.com>
openshift-ci-robot
added
backports/unvalidated-commits
|
@haircommander: This pull request references Jira Issue OCPBUGS-60961, which is valid. 7 validation(s) were run on this bug
Requesting review from QA contact: The bug has been updated to refer to the pull request using the external bug tracker. In response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
@haircommander: the contents of this pull request could not be automatically validated. The following commits could not be validated and must be approved by a top-level approver:
Comment |
|
/retest |
|
/remove-label backports/unvalidated-commits /cc @bertinatto /lgtm /hold |
openshift-ci
bot
added
do-not-merge/hold
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: haircommander, tkashem The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
@tkashem thanks for the heads up. The first PR went in without me noticing (I didn't review it), so I missed this: please avoid merging multiple carries in a single PR, squash them instead. If later on you need a new PR to amend the patch, use the same commit message and add an explanation in the commit description. During the rebase we need to squash these commits, so this will save us a lot of time. Thanks! |
|
@bertinatto would you like me to fix this one? |
|
good to know I'll keep that in mind, thanks! |
|
@haircommander: The following tests failed, say
Full PR test history. Your PR dashboard. 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-sigs/prow repository. I understand the commands that are listed here. |
|
/retest-required |
@haircommander no, that's fine. This is just for next ones. Thanks! |
manual cherry-pick of #2227