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

8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap #1748

Closed
wants to merge 1 commit into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 18, 2023

I backport this to simplify backport of tests that use the new property name.

Resolves were simple, only the method checking the flags set does not match good:

src/hotspot/share/cds/heapShared.hpp
Skipped. is_heap_object_archiving_allowed(), the predecessor of can_write(), does not have this assertion.

src/hotspot/share/prims/whitebox.cpp
I had to adapt this.
In 17, method is_heap_object_archiving_allowed() is called in WB_IsJavaHeapArchiveSupported()
Between 17 and 18, this has been renamed to can_write().
Also, WB_IsJavaHeapArchiveSupported() has been changed to call can_use(),
where this change reverts this to call can_write().
So I leave the call as-is, this shows the desired behaviour.

test/hotspot/jtreg/runtime/cds/SharedStrings.java
test/hotspot/jtreg/runtime/cds/appcds/cacheObject/ArchivedModuleWithCustomImageTest.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/FlagCombo.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/InternSharedString.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LargePages.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/LockSharedStrings.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsBasicPlus.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SharedStringsWbTest.java
test/hotspot/jtreg/runtime/cds/appcds/sharedStrings/SysDictCrash.java
test/hotspot/jtreg/runtime/cds/serviceability/ReplaceCriticalClassesForSubgraphs.java
test/lib/jdk/test/whitebox/WhiteBox.java
Trivial resolves of the property.

test/lib/sun/hotspot/WhiteBox.java: No such file or directory
Skipped, was merged with the other WhiteBox.


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
  • JDK-8273522 needs maintainer approval

Issue

  • JDK-8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1748

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 18, 2023

👋 Welcome back goetz! 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 922e86f4ff28c7b17af8e7b5867a40fc76b7fdd7 8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap Sep 18, 2023
@openjdk
Copy link

openjdk bot commented Sep 18, 2023

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 Sep 18, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 18, 2023

Webrevs

Copy link
Contributor

@RealLucy RealLucy 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.
Did you run tests in addition to GHA?

@openjdk
Copy link

openjdk bot commented Sep 21, 2023

⚠️ @GoeLin 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.

@GoeLin
Copy link
Member Author

GoeLin commented Sep 21, 2023

Thanks for the review!

@openjdk openjdk bot added the approval label Sep 21, 2023
@openjdk
Copy link

openjdk bot commented Sep 22, 2023

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

8273522: Rename test property vm.cds.archived.java.heap to vm.cds.write.archived.java.heap

Reviewed-by: lucy

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

  • 4ebd8b3: 8311514: Incorrect regex in TestMetaSpaceLog.java
  • ac2d89b: 8311813: C1: Uninitialized PhiResolver::_loop field
  • 05964ff: 8315863: [GHA] Update checkout action to use v4
  • 875d24b: Merge
  • a831b7a: 8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
  • a06047a: 8168469: Memory leak in JceSecurity
  • 1a68e52: 8314679: SA fails to properly attach to JVM after having just detached from a different JVM
  • 7588666: 8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
  • a3e8026: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • d2045f9: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
  • ... and 9 more: https://git.openjdk.org/jdk17u-dev/compare/4d8549be8928feb89ea5e0fd0dc23e3d74e76a21...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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Sep 22, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Sep 22, 2023

Yes, I ran all the tests standalone.

@GoeLin
Copy link
Member Author

GoeLin commented Sep 22, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2023

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

  • 4ebd8b3: 8311514: Incorrect regex in TestMetaSpaceLog.java
  • ac2d89b: 8311813: C1: Uninitialized PhiResolver::_loop field
  • 05964ff: 8315863: [GHA] Update checkout action to use v4
  • 875d24b: Merge
  • a831b7a: 8312555: Ideographic characters aren't stretched by AffineTransform.scale(2, 1)
  • a06047a: 8168469: Memory leak in JceSecurity
  • 1a68e52: 8314679: SA fails to properly attach to JVM after having just detached from a different JVM
  • 7588666: 8313657: com.sun.jndi.ldap.Connection.cleanup does not close connections on SocketTimeoutErrors
  • a3e8026: 8294427: Check boxes and radio buttons have rendering issues on Windows in High DPI env
  • d2045f9: 8265586: [windows] last button is not shown in AWT Frame with BorderLayout and MenuBar set.
  • ... and 9 more: https://git.openjdk.org/jdk17u-dev/compare/4d8549be8928feb89ea5e0fd0dc23e3d74e76a21...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 22, 2023

@GoeLin Pushed as commit 6398e46.

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

@GoeLin GoeLin deleted the goetz_backport_8273522 branch September 22, 2023 07:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants