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

8331987: Enhance stacktrace clarity for CompletableFuture CancellationException #19219

Closed
wants to merge 3 commits into from

Conversation

viktorklang-ora
Copy link
Contributor

@viktorklang-ora viktorklang-ora commented May 13, 2024

This change adds wrapping of the CancellationException produced by CompletableFuture::get() and CompletableFuture::join() to add more diagnostic information and align better with FutureTask.

Running the sample code from the JBS issue in JShell will produce the following:

jshell> java.util.concurrent.CancellationException: get
	at java.base/java.util.concurrent.CompletableFuture.reportGet(CompletableFuture.java:392)
	at java.base/java.util.concurrent.CompletableFuture.get(CompletableFuture.java:2073)
	at REPL.$JShell$18.m2($JShell$18.java:10)
	at REPL.$JShell$17.m1($JShell$17.java:8)
	at REPL.$JShell$16B.lambda$main$0($JShell$16B.java:8)
	at java.base/java.lang.Thread.run(Thread.java:1575)
Caused by: java.util.concurrent.CancellationException
	at java.base/java.util.concurrent.CompletableFuture.cancel(CompletableFuture.java:2510)
	at REPL.$JShell$16B.lambda$main$1($JShell$16B.java:11)
	... 1 more

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

Issue

  • JDK-8331987: Enhance stacktrace clarity for CompletableFuture CancellationException (Enhancement - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 19219

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 13, 2024

👋 Welcome back vklang! 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 May 13, 2024

@viktorklang-ora 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:

8331987: Enhance stacktrace clarity for CompletableFuture CancellationException

Reviewed-by: alanb, dfuchs

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

  • 957eb61: 8331429: [JVMCI] Cleanup JVMCIRuntime allocation routines
  • 2f10a31: 8302850: Implement C1 clone intrinsic that reuses arraycopy code for primitive arrays
  • c642f44: 8329839: Cleanup ZPhysicalMemoryBacking trace logging
  • d04ac14: 8332236: javac crashes with module imports and implicitly declared class
  • 4e77cf8: 8330795: C2: assert((uint)type <= T_CONFLICT && _zero_type[type] != nullptr) failed: bad type with -XX:-UseCompressedClassPointers
  • 7b4ba7f: 8325932: Replace ATTRIBUTE_NORETURN with direct [[noreturn]]
  • 0bb5ae6: 8332248: (fc) java/nio/channels/FileChannel/BlockDeviceSize.java failed with RuntimeException
  • 4d32c60: 8322008: Exclude some CDS tests from running with -Xshare:off
  • e91492a: 8313674: (fc) java/nio/channels/FileChannel/BlockDeviceSize.java should test for more block devices
  • 95a6013: 8332042: Move MEMFLAGS to its own include file
  • ... and 16 more: https://git.openjdk.org/jdk/compare/5053b70a7fc67ce9b73dbeecbdd88fbc34d45e04...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.

@viktorklang-ora
Copy link
Contributor Author

@DougLea @AlanBateman Submitting this for review as we discussed.

@openjdk openjdk bot added the rfr Pull request is ready for review label May 13, 2024
@openjdk
Copy link

openjdk bot commented May 13, 2024

@viktorklang-ora 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 May 13, 2024
@mlbridge
Copy link

mlbridge bot commented May 13, 2024

Webrevs

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 14, 2024
Copy link
Member

@dfuch dfuch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@viktorklang-ora
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented May 15, 2024

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

  • 491b3b4: 8332256: Shenandoah: Do not visit heap threads during shutdown
  • 9c02c8d: 8332255: Shenandoah: Remove duplicate definition of init mark closure
  • 42ccb74: 8331940: ClassFile API ArrayIndexOutOfBoundsException with certain class files
  • 61aff6d: 8332112: Update nsk.share.Log to don't print summary during VM shutdown hook
  • 30bb066: 8332003: Clarify javadoc for MemoryLayout::offsetHandle
  • c4867c6: 8329273: C2 SuperWord: Some basic MemorySegment IR tests
  • 8032d64: 8332245: C2: missing record_for_ign() call in GraphKit::must_be_not_null()
  • fa043ae: 8294880: Review running time of jdk/internal/shellsupport/doc/JavadocHelperTest.java
  • a5005c8: 8330814: Cleanups for KeepAliveCache tests
  • 1a94447: 8332111: [BACKOUT] A way to align already compiled methods with compiler directives
  • ... and 26 more: https://git.openjdk.org/jdk/compare/5053b70a7fc67ce9b73dbeecbdd88fbc34d45e04...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented May 15, 2024

@viktorklang-ora Pushed as commit 8a4315f.

💡 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
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
5 participants