Skip to content

8302744: Refactor Hotspot container detection code #1648

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

jankratochvil
Copy link

@jankratochvil jankratochvil commented Apr 14, 2025

A patch 1 of 6 for: [21u] Backport intention of 8322420: [Linux] cgroup v2: Limits in parent nested control groups are not detected

The backport is not clean:

  • src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp and src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp are missing changed CgroupV1Subsystem::memory_and_swap_usage_in_bytes() as JDK-8325139 has not been backported.

  • src/hotspot/os/linux/cgroupV1Subsystem_linux.cpp and src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp are missing changed CgroupV1Subsystem::rss_usage_in_bytes() as JDK-8313083 has not been backported.

  • deleted/renamed test/hotspot/gtest/os/linux/test_cgroupSubsystem_linux.cpp has missing static keywords as JDK-8252136 has not been backported.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8302744 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8302744: Refactor Hotspot container detection code (Enhancement - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/1648/head:pull/1648
$ git checkout pull/1648

Update a local copy of the PR:
$ git checkout pull/1648
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/1648/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1648

View PR using the GUI difftool:
$ git pr show -t 1648

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/1648.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 14, 2025

👋 Welcome back jkratochvil! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Apr 14, 2025

❗ This change is not yet ready to be integrated.
See the Progress checklist in the description for automated requirements.

@openjdk openjdk bot changed the title Backport 3d4eb159e6d597f37081faf21b7e3f0f1af299e5 8302744: Refactor Hotspot container detection code Apr 14, 2025
@openjdk
Copy link

openjdk bot commented Apr 14, 2025

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 14, 2025
@mlbridge
Copy link

mlbridge bot commented Apr 14, 2025

Webrevs

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

This looks OK to me.

@openjdk
Copy link

openjdk bot commented Apr 18, 2025

⚠️ @jankratochvil This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@jerboaa
Copy link
Contributor

jerboaa commented Apr 18, 2025

Please mention what testing you've done when you apply for approval. Did you run container tests on cg v1 and cg v2? In this case I did, but it would be good to know when looking at such backport requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

2 participants