Skip to content

8370492: [Linux] Update cpu shares to cpu.weight mapping function#2512

Closed
sendaoYan wants to merge 4 commits intoopenjdk:masterfrom
openjdk-bots:backport-sendaoYan-5d65c23c-master
Closed

8370492: [Linux] Update cpu shares to cpu.weight mapping function#2512
sendaoYan wants to merge 4 commits intoopenjdk:masterfrom
openjdk-bots:backport-sendaoYan-5d65c23c-master

Conversation

@sendaoYan
Copy link
Copy Markdown
Member

@sendaoYan sendaoYan commented Dec 10, 2025

Hi all,

This pull request contains a backport of commit 5d65c23c from the openjdk/jdk repository.

The commit being backported was authored by Severin Gehwolf on 14 Nov 2025 and was reviewed by Casper Norrbin, Albert Mingkun Yang and SendaoYan.

Thanks!


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8370492 needs maintainer approval

Issue

  • JDK-8370492: [Linux] Update cpu shares to cpu.weight mapping function (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2512

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Dec 10, 2025

👋 Welcome back syan! 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
Copy Markdown

openjdk Bot commented Dec 10, 2025

@sendaoYan This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8370492: [Linux] Update cpu shares to cpu.weight mapping function

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 61 new commits pushed to the master branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk Bot changed the title Backport 5d65c23cd99b72527dcfab9eb6da9510e7dc6330 8370492: [Linux] Update cpu shares to cpu.weight mapping function Dec 10, 2025
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Dec 10, 2025

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

@openjdk openjdk Bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Dec 10, 2025
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Dec 10, 2025

⚠️ @sendaoYan 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.

@openjdk openjdk Bot added the rfr Pull request is ready for review label Dec 10, 2025
@mlbridge
Copy link
Copy Markdown

mlbridge Bot commented Dec 10, 2025

Webrevs

@sendaoYan
Copy link
Copy Markdown
Member Author

Verify commnd

j -jdk:build/linux-x86_64-server-release/images/jdk/ -Djdk.test.docker.image.name=jdk-build -Djdk.test.docker.image.version=11 test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java test/hotspot/jtreg/containers/docker/TestMisc.java test/jdk/jdk/internal/platform/docker/MetricsCpuTester.java

@sendaoYan
Copy link
Copy Markdown
Member Author

@sendaoYan
Copy link
Copy Markdown
Member Author

Blocked by 8346048

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Jan 7, 2026

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Feb 4, 2026

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@sendaoYan
Copy link
Copy Markdown
Member Author

All the tests in test/jdk/jdk/internal/platform/docker and test/hotspot/jtreg/containers/docker/ run passed after this PR, except containers/docker/TestJcmdWithSideCar.java fails

@sendaoYan
Copy link
Copy Markdown
Member Author

/approval request Clean backport update the Linux container detection code to adapt the cg v2 to most recent runtimes' implementation. Before this backport PR, test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java failed, after this backport PR, test/jdk/jdk/internal/platform/docker/TestDockerCpuMetrics.java passed. All the tests in test/jdk/jdk/internal/platform/docker and test/hotspot/jtreg/containers/docker/ run passed after this PR, except containers/docker/TestJcmdWithSideCar.java fails and has been addressed by JDK-8341518

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Feb 17, 2026

@sendaoYan
8370492: The approval request has been created successfully.

@openjdk openjdk Bot added the approval Requires approval; will be removed when approval is received label Feb 17, 2026
@openjdk openjdk Bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Mar 12, 2026
@bridgekeeper
Copy link
Copy Markdown

bridgekeeper Bot commented Mar 17, 2026

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@sendaoYan
Copy link
Copy Markdown
Member Author

Thanks for the approved.

/integrate

@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 17, 2026

Going to push as commit 7206cc3.
Since your change was applied there have been 80 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

@openjdk openjdk Bot added the integrated Pull request has been integrated label Mar 17, 2026
@openjdk openjdk Bot closed this Mar 17, 2026
@openjdk openjdk Bot removed the ready Pull request is ready to be integrated label Mar 17, 2026
@openjdk openjdk Bot removed the rfr Pull request is ready for review label Mar 17, 2026
@openjdk
Copy link
Copy Markdown

openjdk Bot commented Mar 17, 2026

@sendaoYan Pushed as commit 7206cc3.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant