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

8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems) #356

Closed
wants to merge 1 commit into from

Conversation

jmtd
Copy link

@jmtd jmtd commented Sep 16, 2021

This is a test-only backport. This test fix was merged in 11.0.13-oracle.

The test started to fail in JDK mainline after JDK-8241072, but that change is not in-scope for jdk11u. The test in jdk11u right now passes (for me) before and after applying. The test fix seems reasonable to me despite the failure not triggering in 11u (yet?)


Progress

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

Issue

  • JDK-8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/356/head:pull/356
$ git checkout pull/356

Update a local copy of the PR:
$ git checkout pull/356
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/356/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 356

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/356.diff

…2 (multi-homed systems)

Fixed the test - an IPv4 group cannot be joined from an interface that has no IPv4 address configured

Reviewed-by: alanb, amlu
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Sep 16, 2021

👋 Welcome back jdowland! 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 label Sep 16, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Sep 16, 2021

Webrevs

@jmtd
Copy link
Author

@jmtd jmtd commented Sep 16, 2021

Patch applies clean

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 16, 2021

@jmtd Please use PR title "Backport <sha-of-original-commit>". This will make the bots recognize it properly as a backport (and apply the "clean" label).

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 16, 2021

Hi Jon,

can you rename the PR title to "Backport <commit hash>" (0f43de9)? That way the bots will pick up the change and recognize it properly as a backport. It would also be nice to enable Github Actions on your repository to have some tier1 test results.

Cheers
Christoph

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 16, 2021

@jmtd This has some useful info on backporting using the Git workflow: https://wiki.openjdk.java.net/display/JDKUpdates/How+to+contribute+a+fix

@jmtd jmtd changed the title 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems) Backport 0f43de9f026 (0f43de9) Sep 16, 2021
@jmtd jmtd changed the title Backport 0f43de9f026 (0f43de9) Backport 0f43de9f026 Sep 16, 2021
@openjdk openjdk bot removed the rfr label Sep 16, 2021
@jmtd
Copy link
Author

@jmtd jmtd commented Sep 16, 2021

@RealCLanger, @jerboaa thank you for your feedback. I've retitled the PR and enabled actions in my fork (although I haven't imported any actions to it, yet, perhaps I need to do that too. Investigating further).

Severin wrote:

@jmtd This has some useful info on backporting using the Git workflow: https://wiki.openjdk.java.net/display/JDKUpdates/How+to+contribute+a+fix

I've read that, but I hadn't realised that the git commit -m in 2.c) was mandatory rather than illustrative. Noted for next time, thanks!

I assume (since the page doesn't say otherwise) that steps 1-4 are required even for clean backports?

@jmtd jmtd changed the title Backport 0f43de9f026 Backport 0f43de9f026d5405dd7a38799e499312ef8df890 Sep 16, 2021
@openjdk openjdk bot changed the title Backport 0f43de9f026d5405dd7a38799e499312ef8df890 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems) Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

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

@openjdk openjdk bot added the backport label Sep 16, 2021
@jmtd jmtd changed the title 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems) Backport 0f43de9f026d5405dd7a38799e499312ef8df890 Sep 16, 2021
@openjdk openjdk bot added the clean label Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

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

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

8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems)

Fixed the test - an IPv4 group cannot be joined from an interface that has no IPv4 address configured

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

  • 89a1f2a: 8273541: Cleaner Thread creates with normal priority instead of MAX_PRIORITY - 2
  • 295f882: 8261036: Reduce classes loaded by CleanerFactory initialization
  • 25cad2f: 8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
  • 0da130e: 8269951: [macos] Focus not painted in JButton when setBorderPainted(false) is invoked
  • 376d422: 8273358: macOS Monterey does not have the font Times needed by Serif

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ 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 ready rfr labels Sep 16, 2021
@openjdk openjdk bot changed the title Backport 0f43de9f026d5405dd7a38799e499312ef8df890 8246114: java/net/MulticastSocket/Promiscuous.java fails after 8241072 (multi-homed systems) Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

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

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 16, 2021

I've read that, but I hadn't realised that the git commit -m in 2.c) was mandatory rather than illustrative.

It's not mandatory. But if you use that the default PR title will already what the bots need to recognize the backport pr (as opposed to a, say an 11-only PR). Strictly speaking it's the PR title that matters, not the commit message.

I assume (since the page doesn't say otherwise) that steps 1-4 are required even for clean backports?

Yes. But with Github actions you'd get tier1 testing for free.

@jmtd
Copy link
Author

@jmtd jmtd commented Sep 16, 2021

/integrate

@openjdk openjdk bot added the sponsor label Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

@jmtd
Your change (at version 4f2abe4) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

@jerboaa jerboaa commented Sep 16, 2021

/integrate

Please only integrate once a 11u maintainer reponded on the jdk11u-fix-request label/comment on the bug.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 16, 2021

@RealCLanger, @jerboaa thank you for your feedback. I've retitled the PR and enabled actions in my fork (although I haven't imported any actions to it, yet, perhaps I need to do that too. Investigating further).

Now that you have enabled actions, they'll run the next time you push something. The workflow itself is defined in the .github/workflows/submit.yml file of your branch but since you started from a quite current master branch it should be included.

@RealCLanger
Copy link
Contributor

@RealCLanger RealCLanger commented Sep 16, 2021

/sponsor

@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

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

  • e3f923f: 8273795: Zero SPARC64 debug builds fail due to missing interpreter fields
  • 89a1f2a: 8273541: Cleaner Thread creates with normal priority instead of MAX_PRIORITY - 2
  • 295f882: 8261036: Reduce classes loaded by CleanerFactory initialization
  • 25cad2f: 8272806: [macOS] "Apple AWT Internal Exception" when input method is changed
  • 0da130e: 8269951: [macos] Focus not painted in JButton when setBorderPainted(false) is invoked
  • 376d422: 8273358: macOS Monterey does not have the font Times needed by Serif

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Sep 16, 2021
@openjdk openjdk bot added integrated and removed ready rfr sponsor labels Sep 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Sep 16, 2021

@RealCLanger @jmtd Pushed as commit 777039b.

💡 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 clean integrated
4 participants