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

8308593: Add KEEPALIVE Extended Socket Options Support for Windows #117

Closed
wants to merge 1 commit into from

Conversation

tkyc
Copy link
Contributor

@tkyc tkyc commented Aug 29, 2023

This is a clean backport of JDK-8308593, which provides support for the keepalive extended socket options on Windows.

Tier 1 tests were ran and they're passing along with the existing keepalive tests. I also manually tested and confirmed the patch to be working on Windows (specifically Windows 10 since that's the only Windows platform available to me at the moment).


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8308593 needs maintainer approval

Issue

  • JDK-8308593: Add KEEPALIVE Extended Socket Options Support for Windows (Enhancement - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 117

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u/pull/117.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 29, 2023

👋 Welcome back tkyc! 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 f3ade388dac0b882e671462caa762138f44817fb 8308593: Add KEEPALIVE Extended Socket Options Support for Windows Aug 29, 2023
@openjdk
Copy link

openjdk bot commented Aug 29, 2023

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

@openjdk
Copy link

openjdk bot commented Aug 29, 2023

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

8308593: Add KEEPALIVE Extended Socket Options Support for Windows

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

  • 8477ff8: 8315206: RISC-V: hwprobe query is_set return wrong value
  • aef25fc: 8315452: Erroneous AST missing modifiers for partial input
  • 6e54e82: 8314495: Update to use jtreg 7.3.1
  • b207ce7: 8315383: jlink SystemModulesPlugin incorrectly parses the options
  • f1e8b19: 8313167: Update to use jtreg 7.3
  • f07c8f2: 8315688: Update jdk21u fix version to 21.0.2
  • 49bef91: 8313323: javac -g on a java file which uses unnamed variable leads to ClassFormatError when launching that class
  • a4d64ab: 8315534: Incorrect warnings about implicit annotation processing
  • fbc194a: 8299658: C1 compilation crashes in LinearScan::resolve_exception_edge
  • b86a0ce: 8309032: jpackage does not work for module projects unless --module-path is specified
  • ... and 30 more: https://git.openjdk.org/jdk21u/compare/4729fad053b8bdbd821f70141d5c702e72ae6886...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 ready Pull request is ready to be integrated rfr Pull request is ready for review labels Aug 29, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 29, 2023

Webrevs

@tkyc
Copy link
Contributor Author

tkyc commented Sep 8, 2023

/integrate

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

openjdk bot commented Sep 8, 2023

@tkyc
Your change (at version 479e989) is now ready to be sponsored by a Committer.

@openjdk
Copy link

openjdk bot commented Sep 8, 2023

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

@tkyc
Copy link
Contributor Author

tkyc commented Sep 8, 2023

Hello, JBS issue was tagged with maintainer approval.

@jerboaa
Copy link
Contributor

jerboaa commented Sep 11, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Sep 11, 2023

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Sep 11, 2023
@openjdk openjdk bot closed this Sep 11, 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 Sep 11, 2023
@openjdk
Copy link

openjdk bot commented Sep 11, 2023

@jerboaa @tkyc Pushed as commit 1927930.

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