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

8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp #6360

Closed
wants to merge 4 commits into from

Conversation

LanceAndersen
Copy link
Contributor

@LanceAndersen LanceAndersen commented Nov 11, 2021

Hi,

This patch addresses the issue where the very large temp files are not cleaned up after the testMoreThanTwoGB completes.

Best
Lance


Progress

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

Issue

  • JDK-8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6360

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 11, 2021

👋 Welcome back lancea! 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 Nov 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

@LanceAndersen The following label will be automatically applied to this pull request:

  • nio

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 nio label Nov 11, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 11, 2021

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Thanks for taking this one. I guess it should really be Files.delete as both files do exist, leaving it as deleteIfExists is okay. It's possible that creating targetFile will fail and leave sourceFile behind but it will be an empty file so won't fill up the file system. You should use a nested try-finally to avoid these issues. But what you have is okay for now.

@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

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

8276994: java/nio/channels/Channels/TransferTo.java leaves multi-GB files in /tmp

Reviewed-by: alanb

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

  • 6f35eed: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
  • 5e98f99: 8276800: Fix table headers in NumericShaper.html
  • 2ca4ff8: 8244202: Implementation of JEP 418: Internet-Address Resolution SPI
  • c29cab8: 8276112: Inconsistent scalar replacement debug info at safepoints
  • aea0967: 8275854: C2: assert(stride_con != 0) failed: missed some peephole opt
  • 9862cd0: 8275786: New javadoc option to add script files to generated documentation
  • 7a140af: 8276546: [IR Framework] Whitelist and ignore CompileThreshold
  • 91bb0d6: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • 08e0fd6: 8276835: G1: make G1EvacFailureObjectsSet::record inline
  • ad3be04: 8276536: Update TimeZoneNames files to follow the changes made by JDK-8275766
  • ... and 41 more: https://git.openjdk.java.net/jdk/compare/14d66bd438dfa1feeafaca39be8f79a91e2968e9...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.

➡️ 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 label Nov 11, 2021
Files.deleteIfExists(sourceFile);
Files.deleteIfExists(targetFile);
Copy link
Member

@pavelrappo pavelrappo Nov 11, 2021

Choose a reason for hiding this comment

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

What about an exception thrown from Files.deleteIfExists(sourceFile) in that finally block?

Copy link
Member

@dfuch dfuch Nov 11, 2021

Choose a reason for hiding this comment

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

Right - maybe that should be done in a private method where the exception would be catch'ed and logged (printStackTrace) - otherwise an exception in the finally clause risks masking any exception that was thrown before the finally clause was reached.

Path targetFile = null;
try {
// preparing two temporary files which will be compared at the end of the test
sourceFile = Files.createTempFile("test2GBSource", null);
Copy link
Contributor

@AlanBateman AlanBateman Nov 11, 2021

Choose a reason for hiding this comment

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

If this throws then Files.delete(sourceFile) will throw an NPE. I think it would be just a bit more robust to initialize sourceFile to Files.createTempFile(...) rather than null.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Thanks for the update, looks much more robust now.

@LanceAndersen
Copy link
Contributor Author

@LanceAndersen LanceAndersen commented Nov 11, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

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

  • 8aae88b: 8276763: java/nio/channels/SocketChannel/AdaptorStreams.java fails with "SocketTimeoutException: Read timed out"
  • 6f35eed: 8079267: [TEST_BUG] Test java/awt/Frame/MiscUndecorated/RepaintTest.java fails
  • 5e98f99: 8276800: Fix table headers in NumericShaper.html
  • 2ca4ff8: 8244202: Implementation of JEP 418: Internet-Address Resolution SPI
  • c29cab8: 8276112: Inconsistent scalar replacement debug info at safepoints
  • aea0967: 8275854: C2: assert(stride_con != 0) failed: missed some peephole opt
  • 9862cd0: 8275786: New javadoc option to add script files to generated documentation
  • 7a140af: 8276546: [IR Framework] Whitelist and ignore CompileThreshold
  • 91bb0d6: 8276796: gc/TestSystemGC.java large pages subtest fails with ZGC
  • 08e0fd6: 8276835: G1: make G1EvacFailureObjectsSet::record inline
  • ... and 42 more: https://git.openjdk.java.net/jdk/compare/14d66bd438dfa1feeafaca39be8f79a91e2968e9...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 11, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Nov 11, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 11, 2021

@LanceAndersen Pushed as commit b0d7a9d.

💡 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 nio
5 participants