8299858: [Metrics] Swap memory limit reported incorrectly when too large

[jerboaa]

Please review this fix to JDK-8292541 which adds the same handling for swap values exceeding what's possible in the non-container case. I.e. treats it as unlimited and fixes the reporting. This has been handled on the hotspot side similarly with JDK-8292083.

Testing:

• Container tests on linux x86_64 with cg v1
• Container tests on linux x86_64 with cg v2
• GHA (seem to have had some infra issues, so re-running)

---

Progress

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

Issue

• JDK-8299858: [Metrics] Swap memory limit reported incorrectly when too large

Reviewers

• Thomas Stuefe (@tstuefe - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12118/head:pull/12118
$ git checkout pull/12118

Update a local copy of the PR:
$ git checkout pull/12118
$ git pull https://git.openjdk.org/jdk pull/12118/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12118

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12118.diff

[bridgekeeper]

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

[openjdk]

@jerboaa The following labels will be automatically applied to this pull request:

• core-libs
• hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[jerboaa]

Re-running GHA here: https://github.com/jerboaa/jdk/actions/runs/3960838920

[mlbridge]

Webrevs

• 03: Full - Incremental (f0b6818e)
• 02: Full (346ddc84)
• 01: Full - Incremental (abd83cf3)
• 00: Full (abd83cf3)

[openjdk-notifier]

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout jdk-8299858-metrics-swap
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@jerboaa this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout jdk-8299858-metrics-swap
git fetch https://git.openjdk.org/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

[openjdk]

@jerboaa Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

[tstuefe]

Mostly good, small nits.

[jerboaa]

Mostly good, small nits.

Thanks for the review, @tstuefe! I've updated the patch. Please let me know if you want me to change anything else.

[tstuefe]

Good.

[openjdk]

@jerboaa 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:

8299858: [Metrics] Swap memory limit reported incorrectly when too large

Reviewed-by: stuefe

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 26 new commits pushed to the master branch:

• 28545dc: 8300247: Harden C1 xchg on AArch64 and PPC
• 3f63381: 8300913: ZGC: assert(to_addr != 0) failed: Should be forwarded
• da80e7a: 8300962: Parallel: Remove PSParallelCompact::_total_invocations
• 7725fe8: 8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure
• a9b8acb: 8300652: Parallel: Refactor oop marking stack in Full GC
• 15a1488: 8297437: javadoc cannot link to old docs (with old style anchors)
• b0376a5: 8301069: Replace NULL with nullptr in share/libadt/
• 7328182: 8300958: Parallel: Remove unused MutableNUMASpace::capacity_in_words
• 30cb305: 8292170: Convert CodeRootSetTable to use ResourceHashtable
• 3589b80: 8300127: Serial: Remove unnecessary from-space iteration in DefNewGeneration::oop_since_save_marks_iterate
• ... and 16 more: https://git.openjdk.org/jdk/compare/a5d8e12872d9de399fa97b33896635d101b71372...master

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.

[jerboaa]

Windows GHA test failure of compiler/jsr292/ContinuousCallSiteTargetChange seems unrelated.

[jerboaa]

/integrate

[openjdk]

Going to push as commit 64ddf95.
Since your change was applied there have been 26 commits pushed to the master branch:

• 28545dc: 8300247: Harden C1 xchg on AArch64 and PPC
• 3f63381: 8300913: ZGC: assert(to_addr != 0) failed: Should be forwarded
• da80e7a: 8300962: Parallel: Remove PSParallelCompact::_total_invocations
• 7725fe8: 8299953: Merge ContiguousSpaceDCTOC into DirtyCardToOopClosure
• a9b8acb: 8300652: Parallel: Refactor oop marking stack in Full GC
• 15a1488: 8297437: javadoc cannot link to old docs (with old style anchors)
• b0376a5: 8301069: Replace NULL with nullptr in share/libadt/
• 7328182: 8300958: Parallel: Remove unused MutableNUMASpace::capacity_in_words
• 30cb305: 8292170: Convert CodeRootSetTable to use ResourceHashtable
• 3589b80: 8300127: Serial: Remove unnecessary from-space iteration in DefNewGeneration::oop_since_save_marks_iterate
• ... and 16 more: https://git.openjdk.org/jdk/compare/a5d8e12872d9de399fa97b33896635d101b71372...master

Your commit was automatically rebased without conflicts.

[openjdk]

@jerboaa Pushed as commit 64ddf95.

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