Skip to content

Added memory and cpu metrics for cgroupv2#3893

Merged
estesp merged 9 commits intocontainerd:masterfrom
Zyqsempai:3736-added-cpu-and-memory-metrics
Dec 19, 2019
Merged

Added memory and cpu metrics for cgroupv2#3893
estesp merged 9 commits intocontainerd:masterfrom
Zyqsempai:3736-added-cpu-and-memory-metrics

Conversation

@Zyqsempai
Copy link
Copy Markdown
Contributor

Partially fixes #3726
Added memory and cpu metrics for cgroupv2

Signed-off-by: bpopovschi [email protected]

@Zyqsempai
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda PTAL

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 16, 2019

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@codecov-io
Copy link
Copy Markdown

codecov-io commented Dec 16, 2019

Codecov Report

Merging #3893 into master will increase coverage by 0.13%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3893      +/-   ##
==========================================
+ Coverage   42.33%   42.47%   +0.13%     
==========================================
  Files         130      130              
  Lines       14703    14716      +13     
==========================================
+ Hits         6225     6251      +26     
+ Misses       7552     7544       -8     
+ Partials      926      921       -5
Flag Coverage Δ
#linux 45.86% <ø> (+0.12%) ⬆️
#windows 38% <ø> (+0.17%) ⬆️
Impacted Files Coverage Δ
snapshots/devmapper/pool_device.go 55.69% <0%> (-0.41%) ⬇️
remotes/docker/resolver.go 56.25% <0%> (+2.27%) ⬆️
remotes/docker/fetcher.go 59.52% <0%> (+9.52%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5473637...49e7039. Read the comment docs.

Comment thread metrics/cgroups/v2/memory.go Outdated
@Zyqsempai
Copy link
Copy Markdown
Contributor Author

@crosbymichael PTAL

Comment thread metrics/cgroups/v2/memory.go Outdated
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 16, 2019

Build succeeded.

Signed-off-by: bpopovschi <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 16, 2019

Build succeeded.

Comment thread metrics/cgroups/v2/memory.go Outdated
Comment thread metrics/cgroups/v2/cpu.go Outdated
Comment thread metrics/cgroups/v2/cpu.go Outdated
@AkihiroSuda
Copy link
Copy Markdown
Member

Almost looks good, but please check units and typos carefully, thanks

@AkihiroSuda
Copy link
Copy Markdown
Member

btw, could you use your full name for Signed-off-by line in git commits?

Signed-off-by: Boris Popovschi <[email protected]>
@Zyqsempai
Copy link
Copy Markdown
Contributor Author

@AkihiroSuda Sure, done.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 16, 2019

Build succeeded.

Copy link
Copy Markdown
Member

@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

@cpuguy83
Copy link
Copy Markdown
Member

Looks like you still need to edit the first 3 commits with full name?

@Zyqsempai
Copy link
Copy Markdown
Contributor Author

@cpuguy83 Let's leave it for the next time, don't think it's so mandatory.

Comment thread metrics/cgroups/v2/memory.go Outdated
Signed-off-by: Boris Popovschi <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 17, 2019

Build succeeded.

Comment thread cmd/ctr/commands/tasks/metrics.go Outdated
Signed-off-by: Boris Popovschi <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 17, 2019

Build succeeded.

Comment thread metrics/cgroups/v2/cpu.go Outdated
Signed-off-by: Boris Popovschi <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 17, 2019

Build succeeded.

Comment thread metrics/cgroups/v2/cpu.go Outdated
Comment thread metrics/cgroups/v2/memory.go Outdated
Comment thread cmd/ctr/commands/tasks/metrics.go Outdated
Comment thread cmd/ctr/commands/tasks/metrics.go Outdated
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 17, 2019

Build succeeded.

Signed-off-by: Boris Popovschi <[email protected]>
@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci Bot commented Dec 17, 2019

Build succeeded.

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@estesp estesp merged commit aac1ba0 into containerd:master Dec 19, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

cgroups v2 Support

6 participants