-
Notifications
You must be signed in to change notification settings - Fork 216
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 #1751
Conversation
👋 Welcome back tkyc! A progress list of the required criteria for merging this PR into |
This backport pull request has now been updated with issue from the original commit. |
Webrevs
|
/approval request The reason for the backport to 17u is to have keepalive parity with the other OS platforms. The risk is low as the backported code introduces a new code path that only takes effect when keepalive extended socket options are set on a Windows platform. I manually tested the patch and Tier 1 tests were ran and they're passing. No new tests were added as there are existing tests in 17u that cover this scenario. |
/approve yes |
@GoeLin |
Hello, let me know if I need to do anything else on my part to progress this PR to get a reviewer to take a look. |
You need to ask someone in the community to give you a review, best someone with expertise in the area. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
Thanks for the quick review. |
|
@tkyc This pull request has not yet been marked as ready for integration. |
Hello, the changes have been approved by a reviewer. Let me know if there's anything else I need to do to move this PR towards integration. I've attempted to check off the "reviewer" task to complete the PR task list, but that's not working for me. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You need a review before you can integrate, which this is.
In Lib.gmk, the copyright line should read
Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
Similarly in ExtendedSocketOptions.java, the copyright line should red
Copyright (c) 2014, 2023 Oracle and/or its affiliates. All rights reserved.
The changes to Lib.gmk come from JDK-8284890. It seems to me can't be backported because it involved a public API change, so adding linker options in this backport is ok. Same with the change in ExtendedSocketOptions.java to return a Windows-specific PlatformSocketOptions object, and the addition of WindowsSocketOptions.java/c.
So, aside from the above trivial copyright line changes, ltgm. The backport has been approved by the maintainers, so once you've fixed those, you can add a /integrate comment.
Awesome, thanks for the review. |
/integrate |
@tkyc This pull request has not yet been marked as ready for integration. |
@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:
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 244 new commits pushed to the
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. Possible candidates are the reviewers of this PR (@phohensee) but any other Committer may sponsor as well. ➡️ To flag this PR as ready for integration with the above commit message, type |
/integrate |
The GHA failure appears to be an infrastructure issue. |
/sponsor |
Going to push as commit 57bf412.
Your commit was automatically rebased without conflicts. |
@phohensee @tkyc Pushed as commit 57bf412. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
This is an unclean backport of JDK-8308593, which provides support for the keepalive extended socket options on Windows.
The following changes were made in these files to resolve conflicts and issues:
make/modules/jdk.net/Lib.gmk -- I updated this script to support building extnet for Windows.
jdk.net/share/classes/jdk/net/ExtendedSocketOptions.java -- I added a case to support returning an instance of WindowsSocketOptions in PlatformSocketOptions.
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.
Progress
Issue
Reviewers
Reviewing
Using
git
Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/1751/head:pull/1751
$ git checkout pull/1751
Update a local copy of the PR:
$ git checkout pull/1751
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/1751/head
Using Skara CLI tools
Checkout this PR locally:
$ git pr checkout 1751
View PR using the GUI difftool:
$ git pr show -t 1751
Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/1751.diff
Webrev
Link to Webrev Comment