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

8276102: JDK-8245095 integration reverted JDK-8247980 #6153

Closed

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Oct 28, 2021

See the integration commit for JDK-8245095. It reintroduced java/util/stream in exclusiveAccess.dirs, which effectively reverts JDK-8247980. I noticed this because jdk:tier1 became slow again.

@FrauBoes, that was not intentional, right?

The solution is to drop java/util/stream again.

Additional testing:

  • Linux x86_64 fastdebug jdk:tier1 tests are fast again

Progress

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

Issue

  • JDK-8276102: JDK-8245095 integration reverted JDK-8247980

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6153/head:pull/6153
$ git checkout pull/6153

Update a local copy of the PR:
$ git checkout pull/6153
$ git pull https://git.openjdk.java.net/jdk pull/6153/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6153

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6153.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 28, 2021

👋 Welcome back shade! 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 added the rfr Pull request is ready for review label Oct 28, 2021
@openjdk
Copy link

openjdk bot commented Oct 28, 2021

@shipilev The following label will be automatically applied to this pull request:

  • core-libs

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Oct 28, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 28, 2021

Webrevs

@FrauBoes
Copy link
Member

That was definitely not intentional, thanks for spotting @shipilev!

@openjdk
Copy link

openjdk bot commented Oct 29, 2021

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

8276102: JDK-8245095 integration reverted JDK-8247980

Reviewed-by: dfuchs, redestad

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

  • 24cf480: 8276047: G1: refactor G1CardSetArrayLocker
  • e922023: 8275909: [JVMCI] c2v_readFieldValue use long instead of jlong for the offset parameter
  • 157e1d5: 8275856: Remove MetaspaceHandleDeallocations debug switch
  • c9e65f8: 8275440: Remove VirtualSpaceList::is_full()
  • de93b1d: 8257722: Improve "keytool -printcert -jarfile" output
  • 21da218: 8274848: LambdaMetaFactory::metafactory on REF_invokeSpecial impl method has incorrect behavior
  • 48f3fca: 8275308: Add valueOf(Runtime.Version) factory to SourceVersion
  • c6339cb: 8271820: Implementation of JEP 416: Reimplement Core Reflection with Method Handle
  • 5a768f7: 8276054: JMH benchmarks for Fences
  • 6d8fa8f: 8255286: Implement ParametersTypeData::print_data_on fully
  • ... and 57 more: https://git.openjdk.java.net/jdk/compare/f6232982b91cb2314e96ddbde3984836a810a556...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 the ready Pull request is ready to be integrated label Oct 29, 2021
@shipilev
Copy link
Member Author

All right, thanks for reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Oct 29, 2021

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

  • e89b2c0: 8276086: Increase size of metaspace mappings
  • 24cf480: 8276047: G1: refactor G1CardSetArrayLocker
  • e922023: 8275909: [JVMCI] c2v_readFieldValue use long instead of jlong for the offset parameter
  • 157e1d5: 8275856: Remove MetaspaceHandleDeallocations debug switch
  • c9e65f8: 8275440: Remove VirtualSpaceList::is_full()
  • de93b1d: 8257722: Improve "keytool -printcert -jarfile" output
  • 21da218: 8274848: LambdaMetaFactory::metafactory on REF_invokeSpecial impl method has incorrect behavior
  • 48f3fca: 8275308: Add valueOf(Runtime.Version) factory to SourceVersion
  • c6339cb: 8271820: Implementation of JEP 416: Reimplement Core Reflection with Method Handle
  • 5a768f7: 8276054: JMH benchmarks for Fences
  • ... and 58 more: https://git.openjdk.java.net/jdk/compare/f6232982b91cb2314e96ddbde3984836a810a556...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 29, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 29, 2021
@openjdk
Copy link

openjdk bot commented Oct 29, 2021

@shipilev Pushed as commit 15fd8a3.

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

@shipilev shipilev deleted the JDK-8276102-tier1-slowagain branch November 2, 2021 09:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
4 participants