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

8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly #3437

Closed
wants to merge 3 commits into from

Conversation

c-cleary
Copy link
Contributor

@c-cleary c-cleary commented Apr 12, 2021

Description

Inet6Address/B6206527.java test creates two instances of ServerSocket, both of which are explicity bound to a Link-Local address. Neither of the ServerSocket instances are explicitly closed meaning there is no guarantee that their associated resources are freed.

Fix

Each ServerSocket is instantiated in a try-with-resources block. This ensures that in both cases of success or failure within the try-with-resources block, the sockets are always closed thanks to ServerSocket implementing Closeable. The test is also now started in othervm mode as an added assurance of the test's isolation in the event that resources are not freed.


Progress

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

Issue

  • JDK-8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3437

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 12, 2021

👋 Welcome back ccleary! 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 Apr 12, 2021
@openjdk
Copy link

openjdk bot commented Apr 12, 2021

@c-cleary The following label will be automatically applied to this pull request:

  • net

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

@openjdk openjdk bot added the net net-dev@openjdk.org label Apr 12, 2021
@mlbridge
Copy link

mlbridge bot commented Apr 12, 2021

Webrevs

Copy link
Member

@AlekseiEfimov AlekseiEfimov left a comment

Choose a reason for hiding this comment

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

Hi Conor,
The change looks good to me.

ServerSocket ss = new ServerSocket();
System.out.println ("trying LL addr: " + addr);
ss.bind(new InetSocketAddress(addr, 0));
try (ServerSocket ss = new ServerSocket()) {
Copy link
Member

Choose a reason for hiding this comment

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

Maybe for brevity you could use try (var ss = new ServerSocket()) {

Only a suggestion. It's up to you.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Though I agree that the brevity is nice, I think I will leave it as is (ServerSocket instead of var) in the interest of clarity on the type of instance being created in both test cases as it was the original version of the test.

@openjdk
Copy link

openjdk bot commented Apr 13, 2021

@c-cleary 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:

8264824: java/net/Inet6Address/B6206527.java doesn't close ServerSocket properly

Reviewed-by: aefimov, dfuchs, michaelm, vtewari

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

  • 2b5869a: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • bba16f6: 8264818: G1: Improve liveness check for empty pinned regions after full gc marking
  • 75da1e9: 8264423: G1: Rename full gc attribute table states
  • 125a847: 8264788: Make SequentialSubTasksDone use-once
  • 0793fcb: 8260255: C1: LoopInvariantCodeMotion constructor can leave some fields uninitialized
  • b224b56: 8265225: jdk/jfr/tool/TestConfigure.java fails to cleanup the output files after the testing
  • 7c6e379: 8265120: hs_err improvement: align the output of Virtual space metadata
  • e7cbeba: 8259070: Add jcmd option to dump CDS
  • 5931948: 8265246: Fix macos-Aarch64 build after JDK-8263709
  • 79bff21: 8263709: Cleanup THREAD/TRAPS/CHECK usage in JRT_ENTRY routines
  • ... and 47 more: https://git.openjdk.java.net/jdk/compare/b90ad76d6b8a4b2096ae096252dead9626d7e09b...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 (@AlekseiEfimov, @dfuch, @Michael-Mc-Mahon, @vyommani) 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, 2021
@c-cleary
Copy link
Contributor Author

/integrate

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

openjdk bot commented Apr 15, 2021

@c-cleary
Your change (at version 42312d1) is now ready to be sponsored by a Committer.

@AlekseiEfimov
Copy link
Member

/sponsor

@openjdk openjdk bot closed this Apr 15, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed sponsor Pull request is ready to be sponsored ready Pull request is ready to be integrated rfr Pull request is ready for review labels Apr 15, 2021
@openjdk
Copy link

openjdk bot commented Apr 15, 2021

@AlekseiEfimov @c-cleary Since your change was applied there have been 64 commits pushed to the master branch:

  • 6b90715: 8265278: doc build fails after JDK-8262981
  • 0fee6ec: 8264318: Lanai: DrawHugeImageTest.java fails on apple M1
  • 81877f7: 8262501: jdk17 libjvm link failure with --as-needed and clock_gettime in librt
  • b23dbdb: 8257804: Test runtime/modules/ModuleStress/ModuleStressGC.java fails: 'package test defined in module jdk.test, exports list being walked' missing from stdout/stderr
  • 9d669c9: 8262981: Create implementation for NSAccessibilitySlider protocol
  • abdff79: 8163086: java/awt/Window/TranslucentJAppletTest/TranslucentJAppletTest.java fails
  • b72d99e: 8233564: [TESTBUG] MouseComboBoxTest.java is failing
  • 2b5869a: 8233565: [TESTBUG] NullModalityDialogTest.java fails on MacOS
  • bba16f6: 8264818: G1: Improve liveness check for empty pinned regions after full gc marking
  • 75da1e9: 8264423: G1: Rename full gc attribute table states
  • ... and 54 more: https://git.openjdk.java.net/jdk/compare/b90ad76d6b8a4b2096ae096252dead9626d7e09b...master

Your commit was automatically rebased without conflicts.

Pushed as commit 6293299.

💡 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
integrated Pull request has been integrated net net-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

5 participants