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

8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily #711

Closed

Conversation

zhengyu123
Copy link
Contributor

@zhengyu123 zhengyu123 commented Dec 8, 2021

Backport this patch for parity with Oracle 11.0.15.

The patch applies cleanly, but new test does not build. This is due to a couple of CRs [1][2] that affect the test's super class SSLSocketTemplate, are not in jdk11u.

Additional changes to fix the test:

  1. Changed member private volatile int serverPort = 0; => protected volatile int serverPort = 0; in SSLSocketTemplate
  2. Changed method private void doServerSide() => protected void doServerSide() in SSLSocketTemplate
  3. Added member protected volatile InetAddress serverAddress = null; to new test, test never change the value.

Test:

  • Passed new test.

[1] JDK-8209362
[2] JDK-8230435


Progress

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

Issue

  • JDK-8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/711/head:pull/711
$ git checkout pull/711

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 711

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/711.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Dec 8, 2021

👋 Welcome back zgu! 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 8822d41fdcc2c2d568badd72635dc587d21dbd63 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily Dec 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 8, 2021

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr labels Dec 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Dec 8, 2021

Webrevs

Copy link
Contributor

@TheRealMDoerr TheRealMDoerr left a comment

LGTM. Thanks for backporting and explaining your adaptations!

@openjdk
Copy link

@openjdk openjdk bot commented Dec 9, 2021

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

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

8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily

Reviewed-by: mdoerr

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

  • 8878ffc: 8273366: [testbug] javax/swing/UIDefaults/6302464/bug6302464.java fails on macOS12
  • 554498d: 8199079: Test javax/swing/UIDefaults/6302464/bug6302464.java is unstable

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.

@openjdk openjdk bot added the ready label Dec 9, 2021
@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Dec 20, 2021

/integrate

@zhengyu123
Copy link
Contributor Author

@zhengyu123 zhengyu123 commented Dec 20, 2021

Got approval, integrated.

@openjdk
Copy link

@openjdk openjdk bot commented Dec 20, 2021

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Dec 20, 2021
@openjdk openjdk bot closed this Dec 20, 2021
@openjdk openjdk bot removed ready rfr labels Dec 20, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Dec 20, 2021

@zhengyu123 Pushed as commit ec89f1b.

💡 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 integrated
2 participants