Skip to content

Conversation

@dfuch
Copy link
Member

@dfuch dfuch commented Jun 2, 2021

Please find below a fix that will make java/net/DatagramSocket/DatagramSocketMulticasting.java more resilient to the rare case where addresses bound to a network interfaces are updated while the test is running.

Instead of using NetworkInterface::equals to compare network interfaces, the test now use NetworkConfiguration::isSameInterface which only looks at the network interface name and index and ignore the addresses which are bound to it.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8264975: java/net/DatagramSocket/DatagramSocketMulticasting.java fails infrequently

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4313/head:pull/4313
$ git checkout pull/4313

Update a local copy of the PR:
$ git checkout pull/4313
$ git pull https://git.openjdk.java.net/jdk pull/4313/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4313

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4313.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 2, 2021

👋 Welcome back dfuchs! 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 added the rfr Pull request is ready for review label Jun 2, 2021
@openjdk
Copy link

openjdk bot commented Jun 2, 2021

@dfuch The following labels will be automatically applied to this pull request:

  • core-libs
  • net

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added core-libs core-libs-dev@openjdk.org net net-dev@openjdk.org labels Jun 2, 2021
@mlbridge
Copy link

mlbridge bot commented Jun 2, 2021

Webrevs

@AlanBateman
Copy link
Contributor

/label remove core-libs

@openjdk openjdk bot removed the core-libs core-libs-dev@openjdk.org label Jun 2, 2021
@openjdk
Copy link

openjdk bot commented Jun 2, 2021

@AlanBateman
The core-libs label was successfully removed.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

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

I think this looks okay although returning false if ni1 or ni2 is null is subtle (it follows the Objects.equals check so it's okay but I did have to look at it twice).

@openjdk
Copy link

openjdk bot commented Jun 2, 2021

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

8264975: java/net/DatagramSocket/DatagramSocketMulticasting.java fails infrequently

Reviewed-by: alanb, chegar

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

  • ecf6112: 8267958: [TESTBUG] cds DynamicLoaderConstraintsTest.java timed out
  • 1ae934e: 8263332: JFR: Dump recording from a recording stream
  • b7ac705: 8263642: javac emits duplicate checkcast for first bound of intersection type in cast
  • e1462e7: 8267176: StandardDoclet should provide access to Reporter and Locale
  • 56b65e4: 8267569: java.io.File.equals contains misleading Javadoc
  • 508cec7: 8267521: Post JEP 411 refactoring: maximum covering > 50K
  • 40d23a0: 8267543: Post JEP 411 refactoring: security

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jun 2, 2021
@dfuch
Copy link
Member Author

dfuch commented Jun 2, 2021

I think this looks okay although returning false if ni1 or ni2 is subtle (it follows the Objects.equals check so it's okay but I did have to look at it twice).

Thanks Alan. I have added a comment to make it clearer.

@dfuch
Copy link
Member Author

dfuch commented Jun 3, 2021

/integrate

@openjdk openjdk bot closed this Jun 3, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated labels Jun 3, 2021
@openjdk
Copy link

openjdk bot commented Jun 3, 2021

@dfuch Since your change was applied there have been 19 commits pushed to the master branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 1783437.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@openjdk openjdk bot removed the rfr Pull request is ready for review label Jun 3, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

integrated Pull request has been integrated net net-dev@openjdk.org

Development

Successfully merging this pull request may close these issues.

3 participants