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

8324598: use mem_unit when working with sysinfo memory and swap related information #2642

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Apr 5, 2024

Backport of 8324598 ; this backport does not change src/java.base/linux/native/libjava/CgroupMetrics.c

because the adjusted coding in this file is not in jdk11u-dev


Progress

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

Issue

  • JDK-8324598: use mem_unit when working with sysinfo memory and swap related information (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2642

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 5, 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
Copy link

openjdk bot commented Apr 5, 2024

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

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

8324598: use mem_unit when working with sysinfo memory and swap related information

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

  • f9a672a: 8328540: test javax/swing/JSplitPane/4885629/bug4885629.java fails on windows hidpi
  • 8e6a71d: 8299858: [Metrics] Swap memory limit reported incorrectly when too large
  • 4941b84: 8316608: Enable parallelism in vmTestbase/gc/vector tests
  • 4daa077: 8315834: Open source several Swing JSpinner related tests
  • 7d0de46: 8061729: Update java/net tests to eliminate dependency on sun.net.www.MessageHeader and some other internal APIs
  • dd927ed: 8305645: System Tray icons get corrupted when Windows primary monitor changes
  • 21f04a2: 8218917: KeyEvent.getModifiers() returns inconsistent values for ALT keys
  • aa16bfe: 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64

Please see this link for an up-to-date comparison between the source branch of this pull request and 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 7a798d3cebea0915f8a73af57333b3488c2091af 8324598: use mem_unit when working with sysinfo memory and swap related information Apr 5, 2024
@openjdk
Copy link

openjdk bot commented Apr 5, 2024

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 Apr 5, 2024
@mlbridge
Copy link

mlbridge bot commented Apr 5, 2024

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

Choose a reason for hiding this comment

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

Ok. Assuming JDK-8299858 is not supposed to get backported?

@openjdk
Copy link

openjdk bot commented Apr 5, 2024

⚠️ @MBaesken 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 approval label Apr 5, 2024
@GoeLin
Copy link
Member

GoeLin commented Apr 10, 2024

If we want to improve the memory size reporting in 11, I would propose to also backport JDK-8299858 (and do this first).

@MBaesken
Copy link
Member Author

I haven't checked 8299858 for 11. Maybe it fits in there well, maybe not.
Just wanted to backport my change because it fixes a little bug.

@MBaesken
Copy link
Member Author

If we want to improve the memory size reporting in 11, I would propose to also backport JDK-8299858 (and do this first).

Done ,and indeed now the backport of JDK-8324598 is clean after the backport of JDK-8299858 .

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Apr 16, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 14, 2024

@MBaesken 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 add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@MBaesken MBaesken closed this May 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport ready Pull request is ready to be integrated rfr Pull request is ready for review
Development

Successfully merging this pull request may close these issues.

3 participants