Skip to content

Conversation

@ktakakuri
Copy link
Member

@ktakakuri ktakakuri commented Jan 24, 2024

This is a backport of JDK-8238274: (sctp) JDK-7118373 is not fixed for SctpChannel.

This backport is not clean because the test added in this fix uses an API that is not in JDK8.
It has been replaced by the API that is available in JDK8, but the logic of the test remains unchanged.

Also, the constant LIMIT_LINES used in the test must be 3 due to differences in the behavior of the ServerSocket constructor.
When the constructor of ServerSocket is called, the file descriptor is not created in JDK17, but it is created in JDK8, so the number of lines obtained by lsof is different.

Testing:
jdk/com/sun/nio/sctp
on Linux x86_64


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • JDK-8238274 needs maintainer approval
  • Commit message must refer to an issue

Issue

  • JDK-8238274: (sctp) JDK-7118373 is not fixed for SctpChannel (Bug - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 427

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 24, 2024

👋 Welcome back ktakakuri! 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 d91e227abb94953129adc297fbd456c55bb2ae10 8238274: (sctp) JDK-7118373 is not fixed for SctpChannel Jan 24, 2024
@openjdk
Copy link

openjdk bot commented Jan 24, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base rfr Pull request is ready for review labels Jan 24, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 24, 2024

Webrevs

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.

Almost the same as the 11u backport. Lgtm.

@phohensee
Copy link
Member

GHA failures look to be infrastructure issues.

@openjdk
Copy link

openjdk bot commented Jan 25, 2024

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

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 23, 2024

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@openjdk
Copy link

openjdk bot commented Mar 13, 2024

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

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

8238274: (sctp) JDK-7118373 is not fixed for SctpChannel

Reviewed-by: phh, andrew

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

  • b499ea7: 8030204: com/sun/jdi/JdbExprTest.sh: Required output "Can\'t convert 2147483648 to int" not found
  • b1e2ea8: 8279164: Disable TLS_ECDH_* cipher suites
  • 6abb3f2: 8035395: sun/management/jmxremote/startstop/JMXStartStopTest.java fails intermittently: Port already in use
  • 6838605: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
  • bfb1a7d: 4660158: TTY: NumberFormatException while trying to set values by 'set' command
  • 0357abb: 8324632: Update Zlib Data Compression Library to Version 1.3.1
  • 61dde50: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • 8892b81: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
  • 9da7380: 8331730: [8u] GHA: update sysroot for cross builds to Debian bullseye
  • 9a7aa79: 8333669: [8u] GHA: Dead VS2010 download link
  • ... and 62 more: https://git.openjdk.org/jdk8u-dev/compare/552c6866d8ad71ef247b5303f78fa7a65506aea9...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, @gnu-andrew) 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).

@ktakakuri
Copy link
Member Author

/approval request This fix adds the preClose check appropriately. The test added in this patch do not work as is in 8u, so I have made some modifications.
Testing:
jdk/com/sun/nio/sctp on Linux x86_64

@openjdk
Copy link

openjdk bot commented Apr 3, 2024

@ktakakuri
8238274: The approval request has been created successfully.

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Apr 3, 2024
@bridgekeeper
Copy link

bridgekeeper bot commented May 1, 2024

@ktakakuri This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

@bridgekeeper
Copy link

bridgekeeper bot commented May 29, 2024

@ktakakuri This pull request has been inactive for more than 8 weeks and will now be automatically closed. If you would like to continue working on this pull request in the future, feel free to reopen it! This can be done using the /open pull request command.

@bridgekeeper bridgekeeper bot closed this May 29, 2024
@ktakakuri
Copy link
Member Author

/open

@openjdk openjdk bot reopened this May 30, 2024
@openjdk
Copy link

openjdk bot commented May 30, 2024

@ktakakuri This pull request is now open

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

There is actually a replacement for List.of in jdk/test/lib/testlibrary/jdk/testlibrary/Utils.java, so you can replace this with Utils.listOf to get the same behaviour.

The other changes to the testcase look fine.

@ktakakuri
Copy link
Member Author

Thank you.
I replaced List.of with Utils.listOf.

Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

Thanks for changing it. Looks good now.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Jun 25, 2024

@gnu-andrew
8238274: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Jun 25, 2024
@ktakakuri
Copy link
Member Author

/integrate

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

openjdk bot commented Jun 26, 2024

@ktakakuri
Your change (at version 476e09d) is now ready to be sponsored by a Committer.

@phohensee
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 27, 2024

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

  • b499ea7: 8030204: com/sun/jdi/JdbExprTest.sh: Required output "Can\'t convert 2147483648 to int" not found
  • b1e2ea8: 8279164: Disable TLS_ECDH_* cipher suites
  • 6abb3f2: 8035395: sun/management/jmxremote/startstop/JMXStartStopTest.java fails intermittently: Port already in use
  • 6838605: 8311666: Disabled tests in test/jdk/sun/java2d/marlin
  • bfb1a7d: 4660158: TTY: NumberFormatException while trying to set values by 'set' command
  • 0357abb: 8324632: Update Zlib Data Compression Library to Version 1.3.1
  • 61dde50: 8333724: Problem list security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#teliasonerarootcav1
  • 8892b81: 8326521: JFR: CompilerPhase event test fails on windows 32 bit
  • 9da7380: 8331730: [8u] GHA: update sysroot for cross builds to Debian bullseye
  • 9a7aa79: 8333669: [8u] GHA: Dead VS2010 download link
  • ... and 62 more: https://git.openjdk.org/jdk8u-dev/compare/552c6866d8ad71ef247b5303f78fa7a65506aea9...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 27, 2024

@phohensee @ktakakuri Pushed as commit a0715ab.

💡 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 Port of a pull request already in a different code base integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

3 participants