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 CPU/Memory pod stats for CRI stats. #60328

Merged
merged 1 commit into from
Feb 27, 2018
Merged

Add CPU/Memory pod stats for CRI stats. #60328

merged 1 commit into from
Feb 27, 2018

Conversation

Random-Liu
Copy link
Member

@Random-Liu Random-Liu commented Feb 23, 2018 •
edited
Loading

For kubernetes/enhancements#286.

Add CPU and memory stats for pod.

@kubernetes/sig-node-pr-reviews
/cc @dashpole @yujuhong @abhi @yguo0905
Signed-off-by: Lantao Liu lantaol@google.com

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Release note:

Summary API will include pod CPU and Memory stats for CRI container runtime.

@k8s-ci-robot k8s-ci-robot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 23, 2018
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. 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. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note-none Denotes a PR that doesn't merit a release note. labels Feb 23, 2018
@Random-Liu Random-Liu added this to the v1.10 milestone Feb 23, 2018
@Random-Liu
Copy link
Member Author

/retest

1 similar comment
@Random-Liu
Copy link
Member Author

/retest

yguo0905
yguo0905 reviewed Feb 24, 2018
View reviewed changes
pkg/kubelet/stats/cri_stats_provider.go Outdated
podUID types.UID,
allInfos map[string]cadvisorapiv2.ContainerInfo,
) {
podCgroupInfo := getcadvisorPodInfoFromPodUID(podUID, allInfos)
Copy link
Contributor

Choose a reason for hiding this comment

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

Not for changes made in this PR but this should be "getCadvisorPodInfoFromPodUID"

Copy link
Member Author

Choose a reason for hiding this comment

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

Done.

pkg/kubelet/stats/cri_stats_provider.go
cpu, memory := cadvisorInfoToCPUandMemoryStats(podCgroupInfo)
ps.CPU = cpu
ps.Memory = memory
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to log something if it's not found?

Copy link
Member Author

@Random-Liu Random-Liu Feb 26, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

We don't do for cadvisor, so keep it the same.
See

kubernetes/pkg/kubelet/stats/cadvisor_stats_provider.go

Line 136 in 317853c

podInfo := getcadvisorPodInfoFromPodUID(podUID, allInfos)
.

pkg/kubelet/stats/cri_stats_provider.go
@@ -145,12 +144,8 @@ func (p *criStatsProvider) ListPodStats() ([]statsapi.PodStats, error) {
if !found {
ps = buildPodStats(podSandbox)
// Fill stats from cadvisor is available for full set of required pod stats
Copy link
Contributor

Choose a reason for hiding this comment

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

For my education - what does this comment mean?

Copy link
Member Author

Choose a reason for hiding this comment

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

CRI only provides part of cpu/memory stats summary api ,so we still need cadvisor stats to fill in the other fields in summary api.

@yguo0905
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 Feb 24, 2018
@yguo0905
Copy link
Contributor

/hold
for the comments

@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 Feb 24, 2018
@Random-Liu Random-Liu added approved-for-milestone do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 24, 2018
abhi
abhi approved these changes Feb 26, 2018
View reviewed changes
Copy link
Contributor

@abhi abhi left a comment

Choose a reason for hiding this comment

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

Just had one q: why the CPU stats is calculated against all pods (termininated and running)
otherwise LGTM

@Random-Liu
Copy link
Member Author

why the CPU stats is calculated against all pods (termininated and running)

We generate pod stats only when dealing with container stats inside the pod, and we filtered out terminated container stats.

This means that we'll only have pod stats for which has containers running.

@Random-Liu
Add CPU/Memory pod stats for CRI stats.
3688650 
Signed-off-by: Lantao Liu <lantaol@google.com>
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 26, 2018
@yguo0905
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 Feb 26, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Random-Liu, yguo0905

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

@Random-Liu
Copy link
Member Author

Remove hold

@Random-Liu Random-Liu removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 26, 2018
@Random-Liu
Copy link
Member Author

/retest

@k8s-github-robot
Copy link

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

@k8s-github-robot k8s-github-robot merged commit 3039a77 into kubernetes:master Feb 27, 2018
@Random-Liu Random-Liu deleted the fix-pod-stats branch February 27, 2018 08:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yguo0905 yguo0905 yguo0905 left review comments

@abhi abhi abhi approved these changes

@derekwaynecarr derekwaynecarr Awaiting requested review from derekwaynecarr

@dims dims Awaiting requested review from dims

Assignees

@abhi abhi

@yguo0905 yguo0905

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.
5 participants
@Random-Liu @yguo0905 @k8s-ci-robot @k8s-github-robot @abhi