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

Prevent returning invalid usageNanoCores value when cpuacct is reset in a live container #83507

Merged
merged 1 commit into from Feb 9, 2020
Merged

Prevent returning invalid usageNanoCores value when cpuacct is reset in a live container #83507

merged 1 commit into from Feb 9, 2020

Conversation

ashleycutalo
Copy link
Contributor

@ashleycutalo ashleycutalo commented Oct 4, 2019 •
edited

What type of PR is this?
/kind bug

What this PR does / why we need it:

This fixes an issue with that causes similar incorrect reporting of cpu as in #83504. For debugging purposes, it is possible to reset cpuacct to 0 for a live container, which would create the same issue with the calculation for cpu usage, where it is subtracting a nonzero number from zero. We should skip trying to calculate usage if cpuacct has been reset instead in order to prevent returning an invalid value for usageNanoCores.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. 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. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 4, 2019
@k8s-ci-robot
Copy link
Contributor

Hi @ashleykasim. 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-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Oct 4, 2019
@paulnivin paulnivin mentioned this pull request Oct 4, 2019
Merged
@vllry
Copy link
Contributor

vllry commented Oct 4, 2019

/cc

mattjmcnaughton
mattjmcnaughton reviewed Oct 5, 2019
View reviewed changes
Copy link
Contributor

@mattjmcnaughton mattjmcnaughton left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/ok-to-test

pkg/kubelet/stats/cri_stats_provider.go Show resolved Hide resolved
@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 Oct 5, 2019
@k8s-ci-robot k8s-ci-robot added do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. and removed needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Oct 16, 2019
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/contains-merge-commits Indicates a PR which contains merge commits. label Oct 17, 2019
@ashleycutalo
Copy link
Contributor Author

/retest

@vllry
Copy link
Contributor

vllry commented Oct 17, 2019

/assign @tallclair
/assign @yujuhong

tallclair
tallclair reviewed Oct 28, 2019
View reviewed changes
Copy link
Member

@tallclair tallclair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/assign @dashpole @derekwaynecarr

pkg/kubelet/stats/cri_stats_provider.go Outdated Show resolved Hide resolved
dashpole
dashpole reviewed Nov 4, 2019
View reviewed changes
pkg/kubelet/stats/cri_stats_provider.go
@@ -649,7 +649,7 @@ func (p *criStatsProvider) getAndUpdateContainerUsageNanoCores(stats *runtimeapi
defer p.mutex.Unlock()

cached, ok := p.cpuUsageCache[id]
if !ok || cached.stats.UsageCoreNanoSeconds == nil {
if !ok || cached.stats.UsageCoreNanoSeconds == nil || stats.Cpu.UsageCoreNanoSeconds.Value < cached.stats.UsageCoreNanoSeconds.Value {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we return an error to match what we do for negative time values?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My one concern with making this an error is currently this condition will also get triggered by the bug addressed in #83504. Though I suppose an error message for hitting this case would have aided me in debugging what was going on when I was hitting that bug.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct me if I am wrong, but it is a bug if cpu usage reported is reset for a running container. We should fail loudly if at all possible, rather than fail silently. If there are cases where it is expected to be reset, we should log a warning.

@ashleycutalo
Copy link
Contributor Author

/retest

@dims
Copy link
Member

dims commented Dec 13, 2019

/priority important-soon
/milestone v1.18

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Dec 13, 2019
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Dec 13, 2019
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Dec 13, 2019
@markjacksonfishing
Copy link

Hi @ashleykasim

Bug triage team here.
Will this be making it in the v1.18 release?

@markjacksonfishing
Copy link

@dashpole @derekwaynecarr @yujuhong @tallclair

Bug triage team here.
Will this be making it in the v1.18 release?

@dashpole
Copy link
Contributor

dashpole commented Feb 7, 2020

Yeah, this would be good to have in the release.

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 7, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashleykasim, dashpole

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 7, 2020
@vllry
Copy link
Contributor

vllry commented Feb 8, 2020

Looks like a test flake (storage tests).

/retest

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

8 similar comments
@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@fejta-bot
Copy link

/retest
This bot automatically retries jobs that failed/flaked on approved PRs (send feedback to fejta).

Review the full test history for this PR.

Silence the bot with an /lgtm cancel or /hold comment for consistent failures.

@k8s-ci-robot k8s-ci-robot merged commit ac97b2d into kubernetes:master Feb 9, 2020
This was referenced Aug 17, 2020
Merged
Merged
@xuto2 xuto2 mentioned this pull request Aug 20, 2020
Merged
@AbelHu AbelHu mentioned this pull request Aug 20, 2020
Merged
4 tasks
k8s-ci-robot added a commit that referenced this pull request Aug 31, 2020
@k8s-ci-robot
Merge pull request #94040 from andyzhangx/automated-cherry-pick-of-#8…
b9d2e48 
…3507-upstream-release-1.16

Automated cherry pick of #83507: correctly handle resetting cpuacct in a live container
k8s-ci-robot added a commit that referenced this pull request Sep 3, 2020
@k8s-ci-robot
Merge pull request #94041 from andyzhangx/automated-cherry-pick-of-#8…
600dc2e 
…3507-upstream-release-1.17

Automated cherry pick of #83507: correctly handle resetting cpuacct in a live container
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dashpole dashpole dashpole left review comments

@mattjmcnaughton mattjmcnaughton mattjmcnaughton left review comments

@tallclair tallclair tallclair left review comments

@resouer resouer Awaiting requested review from resouer

@tmrts tmrts Awaiting requested review from tmrts

@vllry vllry Awaiting requested review from vllry

Assignees

@dashpole dashpole

@derekwaynecarr derekwaynecarr

@yujuhong yujuhong

@tallclair tallclair

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. lgtm "Looks good to me", indicates that a PR is ready to be merged. 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/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet