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

8259796: timed CompletableFuture.get may swallow InterruptedException #1966

Closed

Conversation

luchenlin
Copy link
Contributor

@luchenlin luchenlin commented Jun 20, 2023

I backport this for parity with 11.0.20-oracle.
depends on JDK-8254350
src/java.base/share/classes/java/util/concurrent/CompletableFuture.java
Resolved due to context
test/jdk/java/util/concurrent/CompletableFuture/LostInterrupt.java
Resolved due to context
test/jdk/java/util/concurrent/CompletableFuture/SwallowedInterruptedException.java
Resolved due to context


Progress

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

Issue

  • JDK-8259796: timed CompletableFuture.get may swallow InterruptedException (Bug - P2)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1966

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 20, 2023

👋 Welcome back luchenlin! 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 f7b96d347ac371dd50ed910e81ce3dd648ec13e1 8259796: timed CompletableFuture.get may swallow InterruptedException Jun 20, 2023
@openjdk
Copy link

openjdk bot commented Jun 20, 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 Jun 20, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 20, 2023

Webrevs

@phohensee
Copy link
Member

This PR includes #1964, so should be changed to be stacked and dependent on that one. Likely be clean once that's done.

Copy link
Member

@GoeLin GoeLin left a comment

Choose a reason for hiding this comment

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

LGTM

@GoeLin
Copy link
Member

GoeLin commented Jun 20, 2023

@phohensee, I also don't see why this is not clean.

@openjdk
Copy link

openjdk bot commented Jun 20, 2023

@luchenlin This change now passes all automated pre-integration checks.

After integration, the commit message for the final commit will be:

8259796: timed CompletableFuture.get may swallow InterruptedException

Reviewed-by: goetz

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@GoeLin) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 20, 2023
@luchenlin luchenlin changed the base branch from master to pr/1964 June 21, 2023 06:22
@openjdk openjdk bot added clean and removed ready Pull request is ready to be integrated labels Jun 21, 2023
@phohensee
Copy link
Member

#1961 had the problem, seems I got my browser tabs mixed up.

@luchenlin luchenlin requested a review from GoeLin June 22, 2023 02:48
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 26, 2023

@luchenlin This pull request has not yet been marked as ready for integration.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/1964 to master June 26, 2023 05:01
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout andrewLulu_backport_8259796
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed clean labels Jun 26, 2023
i556354 added 2 commits June 26, 2023 13:37
# Conflicts:
#	test/jdk/java/util/concurrent/CompletableFuture/SwallowedInterruptedException.java
@openjdk openjdk bot added the clean label Jun 26, 2023
@luchenlin
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 27, 2023
@openjdk
Copy link

openjdk bot commented Jun 27, 2023

@luchenlin
Your change (at version 68b0ca1) is now ready to be sponsored by a Committer.

@GoeLin
Copy link
Member

GoeLin commented Jun 27, 2023

Pre-submit failures: unrelated. Also, they had passed before merging.

@GoeLin
Copy link
Member

GoeLin commented Jun 27, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 27, 2023

Going to push as commit 193dc76.

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

openjdk bot commented Jun 27, 2023

@GoeLin @luchenlin Pushed as commit 193dc76.

💡 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
backport clean integrated Pull request has been integrated
3 participants