Skip to content

Conversation

@TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 24, 2024

Backport of JDK-8051959. Version from 21u applies cleanly, but requires a small adaptation:
1st commit: Same as openjdk/jdk21u-dev#761
2nd commit: Replace currentThread().threadId() by currentThread().getId() because Loom is not in 17u.
Included test has passed.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change requires CSR request JDK-8327569 to be approved
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8051959 needs maintainer approval

Issues

  • JDK-8051959: Add thread and timestamp options to java.security.debug system property (Enhancement - P4 - Approved)
  • JDK-8327569: Add thread and timestamp options to java.security.debug system property (CSR)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2631

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 24, 2024

👋 Welcome back mdoerr! 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
Copy link

openjdk bot commented Jun 24, 2024

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

8051959: Add thread and timestamp options to java.security.debug system property

Reviewed-by: mbaesken

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

  • 859dda1: 8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml
  • a963e2d: 8241550: [macOS] SSLSocketImpl/ReuseAddr.java failed due to "BindException: Address already in use"
  • 0c0871d: 8316389: Open source few AWT applet tests
  • 35cac7f: 8301704: Shorten the number of GCs in UnloadingTest.java to verify a class loader not being unloaded
  • b09c9eb: 8333398: Uncomment the commented test in test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
  • c281c1c: 8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows
  • 1fe0bb4: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • c858b68: 8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
  • 8f5a9f7: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
  • ba3db30: 8319197: Exclude hb-subset and hb-style from compilation
  • ... and 4 more: https://git.openjdk.org/jdk17u-dev/compare/251b8e1ff0f372dba52f4a14dac62860d637aae2...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 changed the title Backport 3b582dff849f1c25336e2efc415eb121f8b12189 8051959: Add thread and timestamp options to java.security.debug system property Jun 24, 2024
@openjdk
Copy link

openjdk bot commented Jun 24, 2024

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 rfr Pull request is ready for review labels Jun 24, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 24, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 25, 2024

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

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jun 25, 2024

/approval request Should get backported for parity with 17.0.13-oracle. The backport has been reviewed and tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 25, 2024

@TheRealMDoerr
8051959: The approval request has been created successfully.

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 25, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 26, 2024

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

  • b99923c: 8329605: hs errfile generic events - move memory protections and nmethod flushes to separate sections
  • 859dda1: 8332174: Remove 2 (unpaired) RLO Unicode characters in ff_Adlm.xml
  • a963e2d: 8241550: [macOS] SSLSocketImpl/ReuseAddr.java failed due to "BindException: Address already in use"
  • 0c0871d: 8316389: Open source few AWT applet tests
  • 35cac7f: 8301704: Shorten the number of GCs in UnloadingTest.java to verify a class loader not being unloaded
  • b09c9eb: 8333398: Uncomment the commented test in test/jdk/java/util/jar/JarFile/mrjar/MultiReleaseJarAPI.java
  • c281c1c: 8328110: Allow simultaneous use of PassFailJFrame with split UI and additional windows
  • 1fe0bb4: 8325384: sun/security/ssl/SSLSessionImpl/ResumptionUpdateBoundValues.java failing intermittently when main thread is a virtual thread
  • c858b68: 8314476: TestJstatdPortAndServer.java failed with "java.rmi.NoSuchObjectException: no such object in table"
  • 8f5a9f7: 8324755: Enable parallelism in vmTestbase/gc/gctests/LargeObjects tests
  • ... and 5 more: https://git.openjdk.org/jdk17u-dev/compare/251b8e1ff0f372dba52f4a14dac62860d637aae2...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 26, 2024

@TheRealMDoerr Pushed as commit f277b39.

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

@TheRealMDoerr TheRealMDoerr deleted the 8051959_timestamp branch June 26, 2024 12:37
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