Skip to content
This repository has been archived by the owner on Feb 2, 2023. It is now read-only.
/ jdk13u-dev Public archive

8226575: OperatingSystemMXBean should be made container aware #8

Closed
wants to merge 1 commit into from

Conversation

kvergizova
Copy link
Contributor

@kvergizova kvergizova commented Nov 3, 2020

The patch applies cleanly, but it requires some modifications.
The original patch added new methods to OperatingSystemMXBean according to CSR JDK-8228428. Backporting them to 13u is not suitable.
Similar to 11u/8u, existing methods have been changed to return the container values instead.
CSR for 13u is filed: JDK-8255834, it's similar to 11u/8u CSR JDK-8248804.

Tested with tier1 and container tests on Linux and Windows, the only failure is containers/docker/TestMemoryAwareness.java which is fixed by follow-up JDK-8236617, the plan is to push them together.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8226575: OperatingSystemMXBean should be made container aware

Reviewers

Download

$ git fetch https://git.openjdk.java.net/jdk13u-dev pull/8/head:pull/8
$ git checkout pull/8

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 3, 2020

👋 Welcome back kvergizova! 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 changed the title Backport 7b82266a159ce363708e347aba7e1b0d38206b48 8226575: OperatingSystemMXBean should be made container aware Nov 3, 2020
@openjdk
Copy link

openjdk bot commented Nov 3, 2020

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 Nov 3, 2020
@mlbridge
Copy link

mlbridge bot commented Nov 3, 2020

Webrevs

@openjdk
Copy link

openjdk bot commented Nov 26, 2020

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

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

8226575: OperatingSystemMXBean should be made container aware

Reviewed-by: yan

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

  • 92da5d8: 8243489: Thread CPU Load event may contain wrong data for CPU time under certain conditions
  • 91b19c9: 8230767: FlightRecorderListener returns null recording
  • 85a31ac: 8227006: [linux] Runtime.availableProcessors execution time increased by factor of 100
  • 170d1a6: 8213535: Windows HiDPI html lightweight tooltips are truncated
  • e9fdf00: 8210977: jdk/jfr/event/oldobject/TestThreadLocalLeak.java fails to find ThreadLocalObject
  • 4623f5a: 8241138: http.nonProxyHosts=* causes StringIndexOutOfBoundsException in DefaultProxySelector
  • 538464b: 8238579: HttpsURLConnection drops the timeout and hangs forever in read
  • a5c8624: 8244621: [macos10.15] Garbled FX printing plus CoreText warnings on Catalina when building with Xcode 11
  • 09ed2f5: 8233452: java.math.BigDecimal.sqrt() with RoundingMode.FLOOR results in incorrect result
  • d3a2f76: 8240603: Windows 32bit compile error after 8238676
  • ... and 40 more: https://git.openjdk.java.net/jdk13u-dev/compare/f9c269fe4b0eed6d0c4c6c881e94398072186301...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@yan-too) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 26, 2020
@kvergizova
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Nov 26, 2020
@openjdk
Copy link

openjdk bot commented Nov 26, 2020

@kvergizova
Your change (at version e3693bb) is now ready to be sponsored by a Committer.

@yan-too
Copy link
Collaborator

yan-too commented Nov 26, 2020

/sponsor

@openjdk openjdk bot closed this Nov 26, 2020
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 26, 2020
@openjdk
Copy link

openjdk bot commented Nov 26, 2020

@yan-too @kvergizova Since your change was applied there have been 50 commits pushed to the master branch:

  • 92da5d8: 8243489: Thread CPU Load event may contain wrong data for CPU time under certain conditions
  • 91b19c9: 8230767: FlightRecorderListener returns null recording
  • 85a31ac: 8227006: [linux] Runtime.availableProcessors execution time increased by factor of 100
  • 170d1a6: 8213535: Windows HiDPI html lightweight tooltips are truncated
  • e9fdf00: 8210977: jdk/jfr/event/oldobject/TestThreadLocalLeak.java fails to find ThreadLocalObject
  • 4623f5a: 8241138: http.nonProxyHosts=* causes StringIndexOutOfBoundsException in DefaultProxySelector
  • 538464b: 8238579: HttpsURLConnection drops the timeout and hangs forever in read
  • a5c8624: 8244621: [macos10.15] Garbled FX printing plus CoreText warnings on Catalina when building with Xcode 11
  • 09ed2f5: 8233452: java.math.BigDecimal.sqrt() with RoundingMode.FLOOR results in incorrect result
  • d3a2f76: 8240603: Windows 32bit compile error after 8238676
  • ... and 40 more: https://git.openjdk.java.net/jdk13u-dev/compare/f9c269fe4b0eed6d0c4c6c881e94398072186301...master

Your commit was automatically rebased without conflicts.

Pushed as commit 89354b8.

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

@kvergizova kvergizova deleted the backport-7b82266a branch November 27, 2020 12:06
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants