Skip to content
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

JDK-8325116: Amend jdk.ContainerConfiguration by swap related value #17865

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Feb 15, 2024

jdk.ContainerInformation event could get amended to report the host total swap values for Linux like was done in
https://bugs.openjdk.org/browse/JDK-8296671 by host total memory.
Two additional fields could be added hostSwapTotal, maybe hostSwapFree;
container free swap space in case we find a good implementation, could also be added to the implementation in os_linux.


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-8325116: Amend jdk.ContainerConfiguration by swap related value (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17865

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 15, 2024

👋 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.

@openjdk openjdk bot added the rfr Pull request is ready for review label Feb 15, 2024
@openjdk
Copy link

openjdk bot commented Feb 15, 2024

@MBaesken The following label will be automatically applied to this pull request:

  • hotspot

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

@openjdk openjdk bot added the hotspot hotspot-dev@openjdk.org label Feb 15, 2024
@mlbridge
Copy link

mlbridge bot commented Feb 15, 2024

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.

Seems fine to me.

@openjdk
Copy link

openjdk bot commented Feb 16, 2024

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

8325116: Amend jdk.ContainerConfiguration by swap related value

Reviewed-by: sgehwolf, lucy, egahlin

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

  • b366492: 8326152: Bad copyright header in test/jdk/java/util/zip/DeflaterDictionaryTests.java
  • 9451677: 8326100: DeflaterDictionaryTests should use Deflater.getBytesWritten instead of Deflater.getTotalOut
  • d422811: 8324630: C1: Canonicalizer::do_LookupSwitch doesn't break the loop when the successor is found
  • 3742bc6: 8323795: jcmd Compiler.codecache should print total size of code cache
  • 099b744: 8326117: ProblemList serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java#default in Xcomp mode
  • 39627bc: 6510914: JScrollBar.getMinimumSize() breaks the contract of JComponent.setMinimumSize()
  • 7004c27: 8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line
  • c2d9fa2: 8326000: Remove obsolete comments for class sun.security.ssl.SunJSSE
  • f50df10: 8299023: TestPLABResize.java and TestPLABPromotion.java are failing intermittently
  • cf13086: 8317697: refactor-encapsulate x86 VM_Version::CpuidInfo
  • ... and 42 more: https://git.openjdk.org/jdk/compare/61f249335d4182544954788534db8a5dde27922c...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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Feb 16, 2024
@jerboaa
Copy link
Contributor

jerboaa commented Feb 16, 2024

/label add hotspot-jfr-dev

@openjdk openjdk bot added the hotspot-jfr hotspot-jfr-dev@openjdk.org label Feb 16, 2024
@openjdk
Copy link

openjdk bot commented Feb 16, 2024

@jerboaa
The hotspot-jfr label was successfully added.

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Looks good.

@MBaesken
Copy link
Member Author

Hi Erik, Lutz and Severin thanks for the reviews !

/integrate

@openjdk
Copy link

openjdk bot commented Feb 19, 2024

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

  • b366492: 8326152: Bad copyright header in test/jdk/java/util/zip/DeflaterDictionaryTests.java
  • 9451677: 8326100: DeflaterDictionaryTests should use Deflater.getBytesWritten instead of Deflater.getTotalOut
  • d422811: 8324630: C1: Canonicalizer::do_LookupSwitch doesn't break the loop when the successor is found
  • 3742bc6: 8323795: jcmd Compiler.codecache should print total size of code cache
  • 099b744: 8326117: ProblemList serviceability/jvmti/vthread/SuspendWithInterruptLock/SuspendWithInterruptLock.java#default in Xcomp mode
  • 39627bc: 6510914: JScrollBar.getMinimumSize() breaks the contract of JComponent.setMinimumSize()
  • 7004c27: 8303972: (zipfs) Make test/jdk/jdk/nio/zipfs/TestLocOffsetFromZip64EF.java independent of the zip command line
  • c2d9fa2: 8326000: Remove obsolete comments for class sun.security.ssl.SunJSSE
  • f50df10: 8299023: TestPLABResize.java and TestPLABPromotion.java are failing intermittently
  • cf13086: 8317697: refactor-encapsulate x86 VM_Version::CpuidInfo
  • ... and 42 more: https://git.openjdk.org/jdk/compare/61f249335d4182544954788534db8a5dde27922c...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 19, 2024
@openjdk openjdk bot closed this Feb 19, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 19, 2024
@openjdk
Copy link

openjdk bot commented Feb 19, 2024

@MBaesken Pushed as commit dc17c26.

💡 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
hotspot hotspot-dev@openjdk.org hotspot-jfr hotspot-jfr-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

4 participants