Skip to content

Conversation

@tstuefe
Copy link
Member

@tstuefe tstuefe commented Aug 4, 2023

We see this exact problem at customers, and the fix is trivial and no-risk, so lets get this fixed.

Unclean backport.

Differences:

  • src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/FileMapInfo.java had been rewritten for 8263002: Remove CDS MiscCode region but it does not affect the effectiveness of this patch.

  • test/hotspot/jtreg/ProblemList.txt: the original patch re-includes the formerly excluded test serviceability/sa/ClhsdbScanOops.java for macos. That exclusion did not exist in 11, so I left the hunk out.

Tests:

I manually tested serviceability/sa/ClhsdbScanOops.java on Linux x64, seems fine.


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-8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2066

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 4, 2023

👋 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 7f634155b5c4b9f07ab73ceb4c6042ac10dad65e 8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace Aug 4, 2023
@openjdk
Copy link

openjdk bot commented Aug 4, 2023

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

@openjdk openjdk bot added the backport Port of a pull request already in a different code base label Aug 4, 2023
@tstuefe tstuefe marked this pull request as ready for review August 4, 2023 18:28
@openjdk openjdk bot added the rfr Pull request is ready for review label Aug 4, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 4, 2023

Webrevs

Copy link
Contributor

@RealCLanger RealCLanger 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.

@openjdk
Copy link

openjdk bot commented Aug 4, 2023

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

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

8243210: ClhsdbScanOops fails with NullPointerException in FileMapHeader.inCopiedVtableSpace

Reviewed-by: clanger

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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 Aug 4, 2023
@tstuefe
Copy link
Member Author

tstuefe commented Aug 7, 2023

GHAs broken for crossbuild platforms; I tested the patch locally with arm32.

Due to the really simple nature of the patch I think the broken GHAs are not relevant.

@tstuefe
Copy link
Member Author

tstuefe commented Aug 7, 2023

Got approval + reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Aug 7, 2023

Going to push as commit 9d15f3e.
Since your change was applied there has been 1 commit pushed to the master branch:

  • f5f17ec: 8248001: javadoc generates invalid HTML pages whose ftp:// links are broken

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 7, 2023

@tstuefe Pushed as commit 9d15f3e.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants