Skip to content

8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612#2096

Closed
toshiogata wants to merge 5 commits intoopenjdk:masterfrom
toshiogata:toshiogata-backport-8217850
Closed

8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612#2096
toshiogata wants to merge 5 commits intoopenjdk:masterfrom
toshiogata:toshiogata-backport-8217850

Conversation

@toshiogata
Copy link
Contributor

@toshiogata toshiogata commented Aug 24, 2023

Hi all,

This is a backport of JDK-8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612

I worked for backporting JDK-8217612, and found that this related patch should be backported at the same time.

The riginal patch is applied cleanly to JDK-8217612 applied code.

Testing: all serviceability agent tests, hotspot_all that includes CompressedClassSpaceSizeInJmapHeap.java and the test which come with JDK-8217612.

Thank you.


Progress

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

Issue

  • JDK-8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612 (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2096

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 24, 2023

👋 Welcome back toshiogata! A progress list of the required criteria for merging this PR into pr/2093 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 49c91b7f9522a991bcac789b9fcccfee8bf08b5d 8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612 Aug 24, 2023
@openjdk
Copy link

openjdk bot commented Aug 24, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required rfr Pull request is ready for review labels Aug 24, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 24, 2023

Webrevs

@openjdk openjdk bot removed the clean Identical backport; no merge resolution required label Aug 24, 2023
@openjdk
Copy link

openjdk bot commented Aug 24, 2023

⚠️ @toshiogata This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

@openjdk openjdk bot added the clean Identical backport; no merge resolution required label Aug 24, 2023
@toshiogata toshiogata force-pushed the toshiogata-backport-8217850 branch from f593091 to 5b7382a Compare August 24, 2023 10:15
@openjdk
Copy link

openjdk bot commented Aug 24, 2023

@toshiogata Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2093 to master August 25, 2023 18:50
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout toshiogata-backport-8217850
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot removed the clean Identical backport; no merge resolution required label Aug 25, 2023
@phohensee
Copy link
Member

Please merge with upstream jdk11u-dev now that #2093 has been integrated. The result should be clean.

@openjdk openjdk bot added the clean Identical backport; no merge resolution required label Aug 28, 2023
@openjdk
Copy link

openjdk bot commented Aug 28, 2023

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

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

8217850: CompressedClassSpaceSizeInJmapHeap fails after JDK-8217612

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:

  • 2bfbe31: 8295737: macOS: Print content cut off when width > height with portrait orientation

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 Aug 28, 2023
@toshiogata
Copy link
Contributor Author

Thank you for your comment. Merged with upstream jdk11u-dev to verify that this is a clean backport.

@toshiogata
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 28, 2023
@openjdk
Copy link

openjdk bot commented Aug 28, 2023

@toshiogata
Your change (at version 21275c4) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 28, 2023

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

  • 2bfbe31: 8295737: macOS: Print content cut off when width > height with portrait orientation

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Aug 28, 2023

@TheRealMDoerr @toshiogata Pushed as commit 81806b7.

💡 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 clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants