Skip to content
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

Fix cpu cfs quota flag with pod cgroups #61294

Merged
merged 1 commit into from
Mar 19, 2018
Merged

Fix cpu cfs quota flag with pod cgroups #61294

merged 1 commit into from
Mar 19, 2018
+54 −11

Conversation

derekwaynecarr
Copy link
Member

@derekwaynecarr derekwaynecarr commented Mar 16, 2018 •
edited
Loading

What this PR does / why we need it:
It fixes the cpu-cfs-quota flag in the kubelet when pod cgroups are enabled.

Which issue(s) this PR fixes
Fixes #61293

Special notes for your reviewer:
This is a regression reported by some of our users that disable cpu quota enforcement.

Release note:

Fix regression where kubelet --cpu-cfs-quota flag did not work when --cgroups-per-qos was enabled

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 16, 2018
@k8s-ci-robot k8s-ci-robot requested review from pmorie and yujuhong March 16, 2018 18:55
@derekwaynecarr
Copy link
Member Author

fyi @sjenning @aveshagarwal - still need to fix unit tests and ensure it passes cross-compile.

@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 16, 2018
@aveshagarwal
Copy link
Member

I tested this PR and it is working as expected.

@sjenning
Copy link
Contributor

/test cross

@sjenning
Copy link
Contributor

/test pull-kubernetes-cross

@derekwaynecarr derekwaynecarr changed the title WIP: Fix cpu cfs quota flag with pod cgroups Fix cpu cfs quota flag with pod cgroups Mar 17, 2018
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Mar 17, 2018
@derekwaynecarr
Copy link
Member Author

/kind bug

@k8s-ci-robot k8s-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Mar 17, 2018
@derekwaynecarr
Copy link
Member Author

/sig node

@k8s-ci-robot k8s-ci-robot added the sig/node Categorizes an issue or PR as relevant to SIG Node. label Mar 17, 2018
@derekwaynecarr
Copy link
Member Author

this is a regression and should also probably be picked into 1.9

@derekwaynecarr derekwaynecarr added this to the v1.10 milestone Mar 17, 2018
@derekwaynecarr
Copy link
Member Author

/priority critical-urgent

@k8s-ci-robot k8s-ci-robot added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Mar 17, 2018
@dims
Copy link
Member

dims commented Mar 17, 2018

@liggitt wanna peek at this?

LGTM 👍

@jdumars
Copy link
Member

jdumars commented Mar 18, 2018

@yujuhong @pmorie PTAL ~ needs an LGTM and approved-for-milestone label ASAP, otherwise we're going to have to cherry pick this into 1.10.

@dims
Copy link
Member

dims commented Mar 19, 2018

@dchen1107 @Random-Liu @vishh - one of you around to LGTM this?

@derekwaynecarr
Copy link
Member Author

/status approved-for-milestone

@sjenning
Copy link
Contributor

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 19, 2018
@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@derekwaynecarr @sjenning

Pull Request Labels
  • sig/node: Pull Request will be escalated to these SIGs if needed.
  • priority/critical-urgent: Never automatically move pull request out of a release milestone; continually escalate to contributor and SIG through all available channels.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 61351, 61294). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 67be0a9 into kubernetes:master Mar 19, 2018
@k8s-ci-robot
Copy link
Contributor

@derekwaynecarr: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-e2e-gce f68f3ff link /test pull-kubernetes-e2e-gce

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@derekwaynecarr derekwaynecarr mentioned this pull request Mar 19, 2018
Merged
openshift-merge-robot added a commit to openshift/origin that referenced this pull request Mar 24, 2018
@openshift-merge-robot
Merge pull request #19028 from derekwaynecarr/bz-1554471
248eabb 
Automatic merge from submit-queue.

UPSTREAM: 61294: Fix cpu cfs quota flag with pod cgroups

https://bugzilla.redhat.com/show_bug.cgi?id=1554471

Upstream: kubernetes/kubernetes#61294
openshift-publish-robot pushed a commit to openshift/kubernetes that referenced this pull request Mar 24, 2018
@k8s-publishing-bot
Merge pull request kubernetes#19028 from derekwaynecarr/bz-1554471
68a8106 
Automatic merge from submit-queue.

UPSTREAM: 61294: Fix cpu cfs quota flag with pod cgroups

https://bugzilla.redhat.com/show_bug.cgi?id=1554471

Upstream: kubernetes#61294

Origin-commit: 248eabbd43cc3b677ce96cc4fdc4c00eda0c44b7
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pmorie pmorie Awaiting requested review from pmorie

@yujuhong yujuhong Awaiting requested review from yujuhong

Assignees

@sjenning sjenning

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.
Projects
None yet
Milestone
v1.10
Development

Successfully merging this pull request may close these issues.

kubelet cpu-cfs-quota flag does not work properly
7 participants
@derekwaynecarr @aveshagarwal @sjenning @dims @jdumars @k8s-github-robot @k8s-ci-robot