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

8286198: [linux] Fix process-memory information #391

Closed

Conversation

tstuefe
Copy link
Member

@tstuefe tstuefe commented May 10, 2022

Hi all,

Backport a fix that correct C-heap usage info numbers in hs-err files. Applies cleanly.

This pull request contains a backport of commit 9e320d9a from the openjdk/jdk repository.

The commit being backported was authored by Thomas Stuefe on 10 May 2022 and was reviewed by David Holmes and Matthias Baesken.

Thanks!


Progress

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

Issue

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk17u-dev pull/391/head:pull/391
$ git checkout pull/391

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 391

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk17u-dev/pull/391.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 10, 2022

👋 Welcome back stuefe! 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 9e320d9ab1813eda705d7318ef964092c50d1ade 8286198: [linux] Fix process-memory information May 10, 2022
@openjdk
Copy link

openjdk bot commented May 10, 2022

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

@openjdk
Copy link

openjdk bot commented May 10, 2022

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

8286198: [linux] Fix process-memory information

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 1 new commit pushed to the master branch:

  • c735f55: 8285921: serviceability/dcmd/jvmti/AttachFailed/AttachReturnError.java fails on Alpine

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 added the ready label May 10, 2022
@tstuefe tstuefe marked this pull request as ready for review May 10, 2022
@openjdk openjdk bot added the rfr label May 10, 2022
@mlbridge
Copy link

mlbridge bot commented May 10, 2022

Webrevs

@tstuefe
Copy link
Member Author

tstuefe commented May 12, 2022

/integrate

@openjdk
Copy link

openjdk bot commented May 12, 2022

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

  • f9a6e0c: 8285956: (fs) Excessive default poll interval in PollingWatchService
  • bbd500f: 8280593: [PPC64, S390] redundant allocation of MacroAssembler in StubGenerator ctor
  • 230cd5e: 8274687: JDWP deadlocks if some Java thread reaches wait in blockOnDebuggerSuspend
  • 296dc78: 8268773: Improvements related to: Failed to start thread - pthread_create failed (EAGAIN)
  • b6404c8: 8282008: Incorrect handling of quoted arguments in ProcessBuilder
  • 31eefe5: 8284848: C2: Compiler blackhole arguments should be treated as globally escaping
  • c735f55: 8285921: serviceability/dcmd/jvmti/AttachFailed/AttachReturnError.java fails on Alpine

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label May 12, 2022
@openjdk openjdk bot closed this May 12, 2022
@openjdk openjdk bot removed ready rfr labels May 12, 2022
@openjdk
Copy link

openjdk bot commented May 12, 2022

@tstuefe Pushed as commit 7cef5a5.

💡 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
backport clean integrated
1 participant