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 #1751

Closed
wants to merge 2 commits into from

Conversation

tkyc
Copy link
Contributor

@tkyc tkyc commented Sep 18, 2023

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:

  1. make/modules/jdk.net/Lib.gmk -- I updated this script to support building extnet for Windows.

  2. 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

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

Issue

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

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 18, 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 Sep 18, 2023
@openjdk
Copy link

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

mlbridge bot commented Sep 18, 2023

Webrevs

@tkyc
Copy link
Contributor Author

tkyc commented Sep 18, 2023

/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.

@openjdk
Copy link

openjdk bot commented Sep 18, 2023

@tkyc The approval request has been created successfully.

@openjdk openjdk bot added the approval label Sep 18, 2023
@GoeLin
Copy link
Member

GoeLin commented Sep 20, 2023

/approve yes

@openjdk
Copy link

openjdk bot commented Sep 20, 2023

@GoeLin
8308593: The approval request has been approved.

@openjdk openjdk bot removed the approval label Sep 20, 2023
@tkyc
Copy link
Contributor Author

tkyc commented Sep 27, 2023

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.

@GoeLin
Copy link
Member

GoeLin commented Oct 17, 2023

You need to ask someone in the community to give you a review, best someone with expertise in the area.

Copy link
Member

@djelinski djelinski left a comment

Choose a reason for hiding this comment

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

LGTM.

@tkyc
Copy link
Contributor Author

tkyc commented Oct 18, 2023

Thanks for the quick review.

@tkyc
Copy link
Contributor Author

tkyc commented Oct 18, 2023

/integrate oops

@openjdk
Copy link

openjdk bot commented Oct 18, 2023

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

@tkyc
Copy link
Contributor Author

tkyc commented Oct 25, 2023

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.

Copy link
Member

@phohensee phohensee left a 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.

@tkyc
Copy link
Contributor Author

tkyc commented Oct 26, 2023

Awesome, thanks for the review.

@tkyc tkyc requested a review from phohensee October 26, 2023 17:24
@tkyc
Copy link
Contributor Author

tkyc commented Oct 26, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 26, 2023

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

@openjdk
Copy link

openjdk bot commented Oct 26, 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.

@openjdk
Copy link

openjdk bot commented Oct 26, 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

Reviewed-by: djelinski, phh

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 master branch:

  • 3af0c4f: 8317373: Add Telia Root CA v2
  • fc28856: 8308910: Allow executeAndLog to accept running process
  • f85053f: 8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160"
  • 5a9ceba: 8228990: JFR: TestNetworkUtilizationEvent.java expects 2+ Network interfaces on Linux but finding 1
  • 93127b4: 8273456: Do not hold ttyLock around stack walking
  • 2c75188: 8225313: serviceability/jvmti/HeapMonitor/MyPackage/HeapMonitorStatObjectCorrectnessTest.java failed with Unexpected high difference percentage
  • 8258f27: 8313252: Java_sun_awt_windows_ThemeReader_paintBackground release resources in early returns
  • 2a9f6e8: 8315644: increase timeout of sun/security/tools/jarsigner/Warning.java
  • d4fe30d: 8316778: test hprof lib: invalid array element type from JavaValueArray.elementSize
  • 73e4745: 8312592: New parentheses warnings after HarfBuzz 7.2.0 update
  • ... and 234 more: https://git.openjdk.org/jdk17u-dev/compare/994f16fe74f0050b7f474a86dd9088451bd554df...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. 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 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 Oct 26, 2023
@tkyc
Copy link
Contributor Author

tkyc commented Oct 26, 2023

/integrate

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

openjdk bot commented Oct 26, 2023

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

@phohensee
Copy link
Member

The GHA failure appears to be an infrastructure issue.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Oct 30, 2023

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

  • 4a638cb: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
  • d61229d: 8314144: gc/g1/ihop/TestIHOPStatic.java fails due to extra concurrent mark with -Xcomp
  • 03e3232: 6445283: ProgressMonitorInputStream not large file aware (>2GB)
  • d7dd1f0: 8315499: build using devkit on Linux ppc64le RHEL puts path to devkit into libsplashscreen
  • 28e9fd3: 8313164: src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp GetRGBPixels adjust releasing of resources
  • 03552ee: 8314883: Java_java_util_prefs_FileSystemPreferences_lockFile0 write result errno in missing case
  • 3af0c4f: 8317373: Add Telia Root CA v2
  • fc28856: 8308910: Allow executeAndLog to accept running process
  • f85053f: 8291911: java/io/File/GetXSpace.java fails with "53687091200 != 161051996160"
  • 5a9ceba: 8228990: JFR: TestNetworkUtilizationEvent.java expects 2+ Network interfaces on Linux but finding 1
  • ... and 240 more: https://git.openjdk.org/jdk17u-dev/compare/994f16fe74f0050b7f474a86dd9088451bd554df...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 30, 2023

@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.

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
4 participants