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

Add AcceleratorStats to cri_stats_provider for 1.19 #97017

Merged
merged 1 commit into from Dec 11, 2020
Merged

Add AcceleratorStats to cri_stats_provider for 1.19 #97017

merged 1 commit into from Dec 11, 2020

Conversation

ruiwen-zhao
Copy link
Contributor

What type of PR is this?
/kind bug

What this PR does / why we need it:
This is a cherry-pick of #96873
Which issue(s) this PR fixes:
See #96873

Fixes #

Special notes for your reviewer:
See #96873

Does this PR introduce a user-facing change?:

AcceleratorStats will be available in the Summary API of kubelet when cri_stats_provider is used.

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

@k8s-ci-robot k8s-ci-robot added this to the v1.19 milestone Dec 2, 2020
@k8s-ci-robot k8s-ci-robot added do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Dec 2, 2020
@ruiwen-zhao
Copy link
Contributor Author

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Dec 2, 2020
@k8s-ci-robot k8s-ci-robot added 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 Dec 2, 2020
@ruiwen-zhao
Copy link
Contributor Author

/priority important-soon

@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 Dec 2, 2020
@ruiwen-zhao ruiwen-zhao changed the title Add AcceleratorStats to cri_stats_provider Add AcceleratorStats to cri_stats_provider for 1.19 Dec 2, 2020
SergeyKanzhelev
SergeyKanzhelev reviewed Dec 2, 2020
View reviewed changes
pkg/kubelet/stats/cri_stats_provider.go
cs.Accelerators = accelerators
}

func (p *criStatsProvider) addCadvisorContainerCPUAndMemoryStats(
Copy link
Member

Choose a reason for hiding this comment

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

so the test for this functionality mocks cAdvisor results. Can you confirm that cAdvisor that was used in 1.19 was producing these metrics? Just a review of commits diff may be enough I think

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah we have checked the diff of cadvisor, and it does not change the behavior on this. And we have actually tested this end-to-endly, and have verified that accelerator metrics are available thru summary API

@SergeyKanzhelev
Copy link
Member

/test pull-kubernetes-e2e-gce-ubuntu-containerd
/lgtm

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

/retest

@dashpole
Copy link
Contributor

dashpole commented Dec 9, 2020

/approve

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Dec 9, 2020
hasheddan
hasheddan approved these changes Dec 9, 2020
View reviewed changes
Copy link
Contributor

@hasheddan hasheddan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dashpole, hasheddan, 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

@justaugustus justaugustus added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Dec 9, 2020
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Dec 9, 2020
@justaugustus
Copy link
Member

/hold until patch releases are complete

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 9, 2020
@justaugustus
Copy link
Member

/hold cancel
Patch releases are out.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 11, 2020
@justaugustus
Copy link
Member

/retest

@k8s-ci-robot k8s-ci-robot merged commit 33612ae into kubernetes:release-1.19 Dec 11, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SergeyKanzhelev SergeyKanzhelev SergeyKanzhelev left review comments

@hasheddan hasheddan hasheddan approved these changes

@dims dims Awaiting requested review from dims

@yujuhong yujuhong Awaiting requested review from yujuhong

Assignees

@SergeyKanzhelev SergeyKanzhelev

@hasheddan hasheddan

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/kubelet cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.19
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@ruiwen-zhao @SergeyKanzhelev @dashpole @k8s-ci-robot @justaugustus @hasheddan