8287011: Improve container information

[MBaesken]

backport of 8287011

---

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-8287011: Improve container information

Reviewers

• Lutz Schmidt (@RealLucy - Committer) ⚠️ Review applies to 09e19bb6
• Martin Doerr (@TheRealMDoerr - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 844

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

Using diff file

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

[bridgekeeper]

👋 Welcome back mbaesken! 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.

[MBaesken]

Adjustments

error: patch failed: src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp:212
error: src/hotspot/os/linux/cgroupV2Subsystem_linux.cpp: patch does not apply

changes in the stride

error: patch failed: src/hotspot/os/linux/osContainer_linux.hpp:27
error: src/hotspot/os/linux/osContainer_linux.hpp: patch does not apply

changes in the stride, added inclusions in higher releases

compile error cgroupV1Subsystem_linux.cpp

cgroupV1Subsystem_linux.cpp : replaced "_unlimited_memory" by os::Linux::physical_memory() , this is what we have in head too

[openjdk]

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

[mlbridge]

Webrevs

• 01: Full - Incremental (7ef0b256)
• 00: Full (09e19bb6)

[RealLucy]

Changes look good to me. The change 1024 -> K could be made in a separate change.
Please note that I'm NOT an updates Reviewer.

[TheRealMDoerr]

What about changes in test/hotspot/jtreg/containers/docker/TestMisc.java?
Otherwise, looks good.

[MBaesken]

What about changes in test/hotspot/jtreg/containers/docker/TestMisc.java? Otherwise, looks good.

Hi Martin, I added the test change now; I think I was in the wrong folder when doing git apply so the test file change was omitted.

[MBaesken]

/integrate

[openjdk]

@MBaesken This pull request has not yet been marked as ready for integration.

[openjdk]

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

8287011: Improve container information

Reviewed-by: lucy, mdoerr

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

• 5fa5392: 8273578: javax/swing/JMenu/4515762/bug4515762.java fails on macOS 12
• 0698930: 8295288: Some vm_flags tests associate with a wrong BugID
• 9fd15d5: 8233648: [TESTBUG] DefaultMenuBarTest.java failing on macos
• 6a45f75: 8280948: Write a regression test for JDK-4659800
• aa98d09: 8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong number of class unload events: expected 10 got 4
• 9732004: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
• 8194120: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
• 5977ce5: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
• ba2f0b4: 8291650: Add delay to ClassUnloadEventTest before exiting to give time for JVM to send all events before VMDeath
• 26351bf: 8290908: misc tests fail: assert(!thread->owns_locks()) failed: must release all locks when leaving VM
• ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/996c0e9317ae9ff0b4ad88d4d050caf2ecf64811...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.

[MBaesken]

/integrate

[openjdk]

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

• d5fedc5: 8244670: convert clhsdb "whatis" command from javascript to java
• 5fa5392: 8273578: javax/swing/JMenu/4515762/bug4515762.java fails on macOS 12
• 0698930: 8295288: Some vm_flags tests associate with a wrong BugID
• 9fd15d5: 8233648: [TESTBUG] DefaultMenuBarTest.java failing on macos
• 6a45f75: 8280948: Write a regression test for JDK-4659800
• aa98d09: 8291456: com/sun/jdi/ClassUnloadEventTest.java failed with: Wrong number of class unload events: expected 10 got 4
• 9732004: 8292879: com/sun/jdi/ClassUnloadEventTest.java failed due to classes not unloading
• 8194120: 8292880: Improve debuggee logging for com/sun/jdi/ClassUnloadEventTest.java
• 5977ce5: 8288302: Shenandoah: SIGSEGV in vm maybe related to jit compiling xerces
• ba2f0b4: 8291650: Add delay to ClassUnloadEventTest before exiting to give time for JVM to send all events before VMDeath
• ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/996c0e9317ae9ff0b4ad88d4d050caf2ecf64811...master

Your commit was automatically rebased without conflicts.

[openjdk]

@MBaesken Pushed as commit e609398.

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