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.

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

fix CPU time of pod stats with cs.CPU.Time #96123

Merged
merged 1 commit into from Nov 4, 2020

Conversation

qiutongs
Copy link
Contributor

@qiutongs qiutongs commented Nov 2, 2020

What type of PR is this?
/kind bug

What this PR does / why we need it:
The "stats update" time of pod CPU stats is incorrectly set to the container start time. This PR fixes this bug.

Which issue(s) this PR fixes:

Fixes #93988

Special notes for your reviewer:

  • I took over the previous PR change cs.StartTime to cs.CPU.Time in addPodCPUMemoryStats #94034. There was some problem with the unit tests. After careful look, I find we need to mock a pod that cadviosr does not return stats info. Only by doing that can we reach the problematic code branch
  • For the change of unit test, I verified the tests failed with old code.
  • Here is how I run the unit tests
make test WHAT=./pkg/kubelet/stats/ GOFLAGS=-v

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. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 2, 2020
@k8s-ci-robot
Copy link
Contributor

@qiutongs: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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 the needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. label Nov 2, 2020
@k8s-ci-robot
Copy link
Contributor

Welcome @qiutongs!

It looks like this is your first PR to kubernetes/kubernetes 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes/kubernetes has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @qiutongs. 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. labels Nov 2, 2020
@k8s-ci-robot
Copy link
Contributor

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


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.

@k8s-ci-robot k8s-ci-robot added sig/node Categorizes an issue or PR as relevant to SIG Node. cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 2, 2020
@qiutongs qiutongs force-pushed the master branch 2 times, most recently from 95e62f4 to 5f299bb Compare November 2, 2020 20:30
@SergeyKanzhelev
Copy link
Member

/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 Nov 3, 2020
Signed-off-by: Qiutong Song <songqt01@gmail.com>
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Nov 3, 2020
@qiutongs
Copy link
Contributor Author

qiutongs commented Nov 3, 2020

/retest

@qiutongs
Copy link
Contributor Author

qiutongs commented Nov 3, 2020

I believe the failed test is not caused by this PR: //staging/src/k8s.io/apiserver/pkg/server/filters:go_default_test

@SergeyKanzhelev
Copy link
Member

/test pull-kubernetes-bazel-test

@SergeyKanzhelev
Copy link
Member

/priority important-soon

cc: @bobbypage

  • After careful look, I find we need to mock a pod that cadviosr does not return stats info. Only by doing that can we reach the problematic code branch

So this is mostly theoretical issue then? I wonder how this statement alignes with this condition where it explicitly checks that the cs stats is NOT nil to enter this code branch.

	// Sum Pod cpu and memory stats from containers stats.
	if cs.CPU != nil {

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 3, 2020
@qiutongs
Copy link
Contributor Author

qiutongs commented Nov 3, 2020

/test pull-kubernetes-bazel-test

@SergeyKanzhelev
Copy link
Member

I misunderstood code and @qiutongs explained it offline.

/lgtm

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

qiutongs commented Nov 4, 2020

/assign @dashpole

@dashpole
Copy link
Contributor

dashpole commented Nov 4, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, qiutongs, ruiwen-zhao

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 Nov 4, 2020
@k8s-ci-robot k8s-ci-robot merged commit 51a5e78 into kubernetes:master Nov 4, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.20 milestone Nov 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. 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
Development

Successfully merging this pull request may close these issues.

The CPU.Time is always set to Container StartTime in pod metrics
5 participants