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

[release-0.8] metrics: fix collecting hugetlb statistics from cgroup v1 #979

Merged
merged 1 commit into from Feb 21, 2023

Conversation

marquiz
Copy link
Contributor

@marquiz marquiz commented Feb 21, 2023

  • Hugetlb statistics collector matched both usage and (later added) reservation accounting files (.rsvd.). When both were present, the collector tried to create duplicate metrics entries: usage and reservation values got the same name and labels.
  • This patch ignores .rsvd. files when collecting statistics in order to keep reporting exactly what was reported before them.
  • Fixes error "cgroup_hugetlb_usage... collected before with the same name and label values" error in cri-resmgr output.
  • Fixes issue curl metrics issue #859.

(cherry picked from commit b9e381c)

Backports #968

- Hugetlb statistics collector matched both usage and (later added)
  reservation accounting files (*.rsvd.*). When both were present, the
  collector tried to create duplicate metrics entries: usage and
  reservation values got the same name and labels.
- This patch ignores *.rsvd.* files when collecting statistics
  in order to keep reporting exactly what was reported before them.
- Fixes error "cgroup_hugetlb_usage... collected before with the same
  name and label values" error in cri-resmgr output.
- Fixes issue intel#859.

(cherry picked from commit b9e381c)
@marquiz marquiz changed the base branch from master to release-0.8 February 21, 2023 10:09
@codecov-commenter
Copy link

Codecov Report

Merging #979 (0690f20) into release-0.8 (7d464f9) will decrease coverage by 1.73%.
The diff coverage is 0.00%.

@@               Coverage Diff               @@
##           release-0.8     #979      +/-   ##
===============================================
- Coverage        33.68%   31.95%   -1.73%     
===============================================
  Files               61       65       +4     
  Lines             9156     9835     +679     
===============================================
+ Hits              3084     3143      +59     
- Misses            5789     6404     +615     
- Partials           283      288       +5     
Impacted Files Coverage Δ
pkg/cgroups/cgroupstats.go 0.00% <0.00%> (ø)
...ce-manager/policy/builtin/dynamic-pools/metrics.go 0.00% <0.00%> (ø)
...source-manager/policy/builtin/dynamic-pools/dyp.go 9.35% <0.00%> (ø)
...source-manager/policy/builtin/dynamic-pools/cpu.go 0.00% <0.00%> (ø)
...urce-manager/policy/builtin/dynamic-pools/flags.go 46.42% <0.00%> (ø)
pkg/cpuallocator/allocator.go 48.32% <0.00%> (+0.15%) ⬆️

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Contributor

@askervin askervin left a comment

Choose a reason for hiding this comment

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

LGTM

@jukkar jukkar merged commit b340806 into intel:release-0.8 Feb 21, 2023
@marquiz marquiz deleted the backports/release-0.8-968 branch February 22, 2023 08:57
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.

None yet

5 participants