Implement HugeTLB metrics #9257

gavinkflam · 2025-06-15T03:07:20Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

CRI-O is not reporting HugeTLB metrics.

Which issue(s) this PR fixes:

Part of #9125

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Added HugeTLB usage (`container_hugetlb_usage_bytes`) and maxUsage (`container_hugetlb_max_usage_bytes`) metrics.

openshift-ci · 2025-06-15T03:07:33Z

Hi @gavinkflam. Thanks for your PR.

I'm waiting for a cri-o 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-sigs/prow repository.

codecov · 2025-06-15T07:53:41Z

Codecov Report

Attention: Patch coverage is 72.85714% with 19 lines in your changes missing coverage. Please review.

Project coverage is 66.93%. Comparing base (92381ff) to head (7c8e7ef).
Report is 12 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #9257      +/-   ##
==========================================
+ Coverage   66.81%   66.93%   +0.11%     
==========================================
  Files         199      200       +1     
  Lines       27469    27613     +144     
==========================================
+ Hits        18353    18482     +129     
- Misses       7585     7608      +23     
+ Partials     1531     1523       -8

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

gavinkflam · 2025-06-17T03:21:52Z

@sohankunkerkar I have fixed the freebsd build. Could you please approve the workflows again?

sohankunkerkar · 2025-06-17T16:07:05Z

@gavinkflam Thanks for the PR. Could you write an integration test for this? You can find more details under https://github.com/cri-o/cri-o/tree/main/test

sohankunkerkar · 2025-06-17T16:08:11Z

/ok-to-test

vendor/github.com/opencontainers/cgroups/fs2/hugetlb.go

test/cri-metrics.bats

internal/lib/stats/metrics.go

internal/oci/runtime_vm.go

test/cri-metrics.bats

gavinkflam · 2025-06-23T02:16:50Z

Thanks @sohankunkerkar! I wrote an integration test and fixed some issues.

A bug from upstream is preventing us from getting cgroup v2 HugeTLB stats. Once my pull request is accepted by upstream, I will update the go.mod version.

opencontainers/cgroups#24

internal/lib/stats/metrics.go

test/cri-metrics.bats

internal/config/cgmgr/stats_linux.go

test/usehugetlb/usehugetlb.go

bitoku · 2025-06-30T10:39:13Z

@gavinkflam Can you fix the vendor by running make vendor ?
Other than that it lgtm.

gavinkflam · 2025-06-30T12:28:21Z

Thanks @bitoku.

I'm still waiting for upstream to merge my PR opencontainers/cgroups#24. There is a bug that prevents us from getting cgroup v2 HugeTLB stats. Once that is merged, I will update go.mod and run make vendor.

gavinkflam · 2025-07-16T02:22:21Z

@bitoku This is updated. Thank you for the feedbacks.

bitoku · 2025-07-16T09:19:53Z

/lgtm

bitoku · 2025-07-16T10:29:13Z

/release-note-edit

Added HugeTLB usage (`container_hugetlb_usage_bytes`) and maxUsage (`container_hugetlb_max_usage_bytes`) metrics.

bitoku · 2025-07-16T11:26:58Z

/skip
/retest-required

bitoku · 2025-07-16T12:48:29Z

@cri-o/cri-o-maintainers PTAL

test/testdata/usehugetlb.c

test/cri-metrics.bats

Signed-off-by: Gavin Lam <gavin.oss@tutamail.com>

gavinkflam · 2025-07-17T03:49:16Z

I've improved the tests to avoid potential flakiness around the sleeps. PTAL.

@saschagrunert @bitoku

sohankunkerkar

@cri-o/cri-o-maintainers PTAL

sohankunkerkar · 2025-07-18T17:05:36Z

/retest

haircommander · 2025-07-21T19:13:06Z

/override ci/prow/ci-e2e-evented-pleg

openshift-ci · 2025-07-21T19:13:12Z

@haircommander: Overrode contexts on behalf of haircommander: ci/prow/ci-e2e-evented-pleg

In response to this:

/override ci/prow/ci-e2e-evented-pleg

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-sigs/prow repository.

gavinkflam · 2025-07-22T14:35:11Z

@bitoku Can I get another lgtm please? The previous one is gone because of the last commit.

openshift-ci · 2025-07-23T05:57:51Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: gavinkflam, saschagrunert, sohankunkerkar

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:

~~OWNERS~~ [saschagrunert,sohankunkerkar]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Implement HugeTLB metrics Signed-off-by: Rehan Khan <Rehan.Khan7@ibm.com>

gavinkflam requested review from fidencio and mrunalp as code owners June 15, 2025 03:07

openshift-ci bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/feature Categorizes issue or PR as related to a new feature. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. labels Jun 15, 2025

openshift-ci bot requested review from hasan4791 and littlejawa June 15, 2025 03:07

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jun 15, 2025

gavinkflam force-pushed the 9125-hugetlb-metrics branch 2 times, most recently from 658816a to 51ea0cf Compare June 17, 2025 02:19

openshift-ci bot 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 Jun 17, 2025

gavinkflam force-pushed the 9125-hugetlb-metrics branch from 51ea0cf to 3ec8159 Compare June 22, 2025 19:48

gavinkflam commented Jun 22, 2025

View reviewed changes

vendor/github.com/opencontainers/cgroups/fs2/hugetlb.go Show resolved Hide resolved

gavinkflam commented Jun 22, 2025

View reviewed changes

test/cri-metrics.bats Show resolved Hide resolved

gavinkflam commented Jun 22, 2025

View reviewed changes

internal/lib/stats/metrics.go Show resolved Hide resolved

gavinkflam commented Jun 23, 2025

View reviewed changes

internal/oci/runtime_vm.go Outdated Show resolved Hide resolved

gavinkflam commented Jun 23, 2025

View reviewed changes

test/cri-metrics.bats Outdated Show resolved Hide resolved

bitoku reviewed Jun 26, 2025

View reviewed changes

internal/lib/stats/metrics.go Outdated Show resolved Hide resolved

test/cri-metrics.bats Outdated Show resolved Hide resolved

internal/config/cgmgr/stats_linux.go Show resolved Hide resolved

test/usehugetlb/usehugetlb.go Outdated Show resolved Hide resolved

gavinkflam force-pushed the 9125-hugetlb-metrics branch from 3ec8159 to 0033f5e Compare June 28, 2025 02:45

gavinkflam mentioned this pull request Jul 1, 2025

fs2: Fix statHugeTlb error when rsvd usage is present opencontainers/cgroups#24

Merged

gavinkflam force-pushed the 9125-hugetlb-metrics branch from 0033f5e to cf1c61b Compare July 15, 2025 04:29

openshift-ci bot assigned bitoku Jul 16, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 16, 2025

saschagrunert reviewed Jul 16, 2025

View reviewed changes

test/testdata/usehugetlb.c Outdated Show resolved Hide resolved

test/cri-metrics.bats Outdated Show resolved Hide resolved

Implement HugeTLB metrics

7c8e7ef

Signed-off-by: Gavin Lam <gavin.oss@tutamail.com>

gavinkflam force-pushed the 9125-hugetlb-metrics branch from 42a7530 to 7c8e7ef Compare July 17, 2025 03:43

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 17, 2025

gavinkflam requested a review from saschagrunert July 17, 2025 03:47

sohankunkerkar approved these changes Jul 18, 2025

View reviewed changes

openshift-ci bot assigned sohankunkerkar Jul 18, 2025

openshift-ci bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jul 18, 2025

sohankunkerkar removed the lgtm Indicates that a PR is ready to be merged. label Jul 18, 2025

saschagrunert approved these changes Jul 23, 2025

View reviewed changes

openshift-ci bot assigned saschagrunert Jul 23, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2025

openshift-merge-bot bot merged commit ec7450f into cri-o:main Jul 23, 2025
84 of 89 checks passed

gavinkflam deleted the 9125-hugetlb-metrics branch July 23, 2025 12:35

R3hankhan123 pushed a commit to R3hankhan123/cri-o that referenced this pull request Jul 24, 2025

Merge pull request cri-o#9257 from gavinkflam/9125-hugetlb-metrics

40a0467

Implement HugeTLB metrics Signed-off-by: Rehan Khan <Rehan.Khan7@ibm.com>

github-actions bot mentioned this pull request Sep 14, 2025

Bump crio from v1.30.3 to v1.34.0 kokyhm/kubespray#293

Open

Implement HugeTLB metrics #9257

Implement HugeTLB metrics #9257

Uh oh!

Conversation

gavinkflam commented Jun 15, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Uh oh!

openshift-ci bot commented Jun 15, 2025

Uh oh!

codecov bot commented Jun 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

gavinkflam commented Jun 17, 2025

Uh oh!

sohankunkerkar commented Jun 17, 2025

Uh oh!

sohankunkerkar commented Jun 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gavinkflam commented Jun 23, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

bitoku commented Jun 30, 2025

Uh oh!

gavinkflam commented Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

gavinkflam commented Jul 16, 2025

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

bitoku commented Jul 16, 2025

Uh oh!

Uh oh!

Uh oh!

gavinkflam commented Jul 17, 2025

Uh oh!

sohankunkerkar left a comment

Choose a reason for hiding this comment

Uh oh!

sohankunkerkar commented Jul 18, 2025

Uh oh!

haircommander commented Jul 21, 2025

Uh oh!

openshift-ci bot commented Jul 21, 2025

Uh oh!

gavinkflam commented Jul 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jul 23, 2025

Uh oh!

Uh oh!

Uh oh!

gavinkflam commented Jun 15, 2025 •

edited by openshift-ci bot

Loading

codecov bot commented Jun 15, 2025 •

edited

Loading

gavinkflam commented Jun 30, 2025 •

edited

Loading

gavinkflam commented Jul 22, 2025 •

edited

Loading