jdk

jdk copied to clipboard

Change the test to use a custom scheduler so there is better control on when the carrier threads terminates. Also convert test to TestNG so that all test cases can be run in the context of a virtual thread.

---

Progress

• [ ] Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• [x] Change must not contain extraneous whitespace
• [x] Commit message must refer to an issue

Issue

• JDK-8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/9819/head:pull/9819
$ git checkout pull/9819

Update a local copy of the PR:
$ git checkout pull/9819
$ git pull https://git.openjdk.org/jdk pull/9819/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 9819

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/9819.diff

:wave: Welcome back alanb! 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.

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

Now that we have control over termination of carrier thread which can be stopped at will without waiting for 30s or more, we can again test all cases even with virtual threads...

Yes, we can. I'll convert the test to run as a TestNG test and we can use a data provider for that.

Webrevs

• 02: Full (b54641a4)
• 01: Full - Incremental (126584bc)
• 00: Full (0689fd44)

/contributor add plevart

@AlanBateman Contributor Peter Levart <[email protected]> successfully added.

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

8292051: jdk/internal/misc/TerminatingThreadLocal/TestTerminatingThreadLocal.java failed "AssertionError: Expected terminated values: [666] but got: []"

Co-authored-by: Peter Levart <[email protected]>
Reviewed-by: plevart

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:

• 1d9c2f7a6e3e897721ef99af8f383a07148b7c4e: 8292279: (fs) Use try-with-resources to release NativeBuffer

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.

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

/integrate

@AlanBateman Since your change was applied there have been 45 commits pushed to the master branch:

• 1ef4e484889c77cccadea44025924b2d010ba2cc: 8273860: Javadoc Deprecated API list should not use italic font for description column
• 0cc66aeae8cbf2d01be5f5ba38e46f1deb9ec7a6: 8285790: AArch64: Merge C2 NEON and SVE matching rules
• da477b13661b39e1f48b674f7fd9ea1d26521fc3: 8292509: ProblemList java/lang/invoke/lambda/LogGeneratedClassesTest.java on windows
• 01b87ba8e2c48ad29c1f4771973ebbe938967448: 8289616: Drop use of Thread.stop in AppContext
• e44e3f0c1976a513c6637545f49f49de84cbac02: 8289106: Add model of class file versions to core reflection
• c3d3662e52de434adb267485982fbf8541bdc0c8: 8292313: 2 runtime/cds/appcds tests fail after JDK-8284313
• 3e122419b2979235f57c0dd549ca63647ea73753: 8290775: Some doc errors in DerOutputStream.java
• ec53fba03933446024028555b87c6023895a5dc6: 8292361: Build failure on PPC64 BE after JDK-8290840
• 4cc6cb9d9ddbcc540baac7b81398f2af83f93340: 8290041: ModuleDescriptor.hashCode is inconsistent
• d1edda8ff52e172a85d102d7d5062b9cc401beea: 8292338: aarch64: Use cbnz instruction in gen_continuation_enter when possible
• ... and 35 more: https://git.openjdk.org/jdk/compare/a9bc1499928eedfed7f9a1e7b8c101c32103a1fd...master

It was not possible to rebase your changes automatically. Please merge master into your branch and try again.

/integrate

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

• 1d9c2f7a6e3e897721ef99af8f383a07148b7c4e: 8292279: (fs) Use try-with-resources to release NativeBuffer

Your commit was automatically rebased without conflicts.

@AlanBateman Pushed as commit 0bfb12162f6035559a114176115b91aff6df3b64.

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