Skip to content

Conversation

@benty-amzn
Copy link
Contributor

@benty-amzn benty-amzn commented Apr 13, 2023

Backport-of: 269eae61894b6bd0a7512045a369b53df747f6e5

Backport is not clean, because 8167295 has not been backported to jdk8u.

This fixes a bug in common network code with MacOS, and it is already fixed in all other JDK releases. See the JBS issue for more info


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

Issue

  • JDK-8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 303

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

Using diff file

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

Webrev

Link to Webrev Comment

…" on macOS 12.4

Reviewed-by: clanger
Backport-of: 269eae61894b6bd0a7512045a369b53df747f6e5
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 13, 2023

👋 Welcome back btaylor! 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 269eae61894b6bd0a7512045a369b53df747f6e5 8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4 Apr 13, 2023
@openjdk
Copy link

openjdk bot commented Apr 13, 2023

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 Apr 13, 2023
@mlbridge
Copy link

mlbridge bot commented Apr 13, 2023

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.

Lgtm. Testing?

@openjdk
Copy link

openjdk bot commented Apr 13, 2023

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

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

8285515: (dc) DatagramChannel.disconnect fails with "Invalid argument" on macOS 12.4

Reviewed-by: phh, shade

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 29 new commits pushed to 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.

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, @shipilev) 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 Apr 13, 2023
@benty-amzn
Copy link
Contributor Author

All tests in jdk/test/java/nio/channels/DatagramChannel were run.
I have 3 failures:

runner finished test: java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java
Failed. Execution failed: `main’ threw exception: java.lang.RuntimeException: Expected message not recieved


runner finished test: java/nio/channels/DatagramChannel/ReceiveISA.java
Failed. Execution failed: `main’ threw exception: java.lang.Exception: Source address for packets 1 & 2 should be equal

runner finished test: java/nio/channels/DatagramChannel/ChangingAddress.java
Failed. Execution failed: `main’ threw exception: java.lang.RuntimeException: Expected: 0.0.0.0/0.0.0.0, actual: /192.168.1.240

however these tests also fail without the backport present, and I believe they are an issue with my local network or configuration unrelated to the patch.

@benty-amzn
Copy link
Contributor Author

/integrate

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

openjdk bot commented Apr 25, 2023

@benty-amzn
Your change (at version b944a3a) is now ready to be sponsored by a Committer.

@bridgekeeper
Copy link

bridgekeeper bot commented May 23, 2023

@benty-amzn 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!

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks fine to me, thanks.

@shipilev
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented May 24, 2023

Going to push as commit c7c080a.
Since your change was applied there have been 29 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 May 24, 2023
@openjdk openjdk bot closed this May 24, 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 May 24, 2023
@openjdk
Copy link

openjdk bot commented May 24, 2023

@shipilev @benty-amzn Pushed as commit c7c080a.

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

4 participants