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

8264152: javax/net/ssl/DTLS/RespondToRetransmit.java timed out #2628

Closed
wants to merge 6 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Mar 27, 2024

I backport this to streamline the tests in 11.

The patch applies clean, but I had to adapt it to Java 11.

DTLSOverDatagram.java is refactored to use recoreds, I just reverted this.
I also removed -> from switch statments.


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
  • JDK-8264152 needs maintainer approval

Issue

  • JDK-8264152: javax/net/ssl/DTLS/RespondToRetransmit.java timed out (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2628

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Mar 27, 2024

👋 Welcome back goetz! 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 Mar 27, 2024

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

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

8264152: javax/net/ssl/DTLS/RespondToRetransmit.java timed out

Reviewed-by: lucy

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.

➡️ 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 79adc16fd8ba47a8d9438f3467f92ab241766c1d 8264152: javax/net/ssl/DTLS/RespondToRetransmit.java timed out Mar 27, 2024
@openjdk
Copy link

openjdk bot commented Mar 27, 2024

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 Mar 27, 2024
@mlbridge
Copy link

mlbridge bot commented Mar 27, 2024

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

LGTM.
Rather huge backport. Please make sure all tests complete OK.

@openjdk
Copy link

openjdk bot commented Mar 27, 2024

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

@GoeLin GoeLin changed the base branch from master to pr/2627 March 28, 2024 08:06
@openjdk openjdk bot added approval and removed approval labels Mar 28, 2024
@openjdk-notifier openjdk-notifier bot changed the base branch from pr/2627 to master March 28, 2024 10:29
@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 goetz_backport_8264152
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
Copy link

openjdk bot commented Mar 28, 2024

@GoeLin this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout goetz_backport_8264152
git fetch https://git.openjdk.org/jdk11u-dev.git master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added the merge-conflict Pull request has merge conflict with target branch label Mar 28, 2024
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed merge-conflict Pull request has merge conflict with target branch labels Mar 28, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Mar 30, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 30, 2024

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

  • 5d4de36: 8286705: GCC 12 reports use-after-free potential bugs

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Mar 30, 2024

@GoeLin Pushed as commit 979daf5.

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

@GoeLin GoeLin deleted the goetz_backport_8264152 branch March 30, 2024 15:10
@GoeLin
Copy link
Member Author

GoeLin commented Mar 30, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Mar 30, 2024

@GoeLin The command integrate can only be used in open pull requests.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

2 participants