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

8140241: (fc) Data transfer from FileChannel to itself causes hang in case of overlap #292

Closed
wants to merge 1 commit into from

Conversation

@akashche
Copy link
Contributor

@akashche akashche commented Nov 19, 2021

Clean backport of a Mac-specific fix.

Additional testing:

  • checked that added test passes on Mac with this patch. Was unable to reproduce the issue (in virtualized env) without the patch.
  • ran jtreg:jdk/java/nio/channels/FileChannel/ on Mac, Linux and Windows

Progress

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

Issue

  • JDK-8140241: (fc) Data transfer from FileChannel to itself causes hang in case of overlap

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 292

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Nov 19, 2021

👋 Welcome back akasko! 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 428d51694f56788f89e8df100a74cbadd369ffa6 8140241: (fc) Data transfer from FileChannel to itself causes hang in case of overlap Nov 19, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

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

@openjdk
Copy link

@openjdk openjdk bot commented Nov 19, 2021

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

8140241: (fc) Data transfer from FileChannel to itself causes hang in case of overlap

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Nov 19, 2021

Webrevs

@akashche
Copy link
Contributor Author

@akashche akashche commented Nov 23, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Nov 23, 2021

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

  • 9be7550: 8272095: ProblemList java/nio/channels/FileChannel/Transfer2GPlus.java on linux-aarch64
  • d2d734c: 8276927: [ppc64] Port shenandoahgc to linux on ppc64le
  • dc7216a: 8275811: Incorrect instance to dispose
  • 6f2bdc0: 8274736: Concurrent read/close of SSLSockets causes SSLSessions to be invalidated unnecessarily
  • d998761: 8276139: TestJpsHostName.java not reliable, better to expand HostIdentifierCreate.java test
  • 7ffac79: 8277195: missing CAccessibility definition in [CommonComponentAccessibility accessibilityHitTest]
  • 03ef5a9: 8273235: tools/launcher/HelpFlagsTest.java Fails on Windows 32bit
  • 562cb4a: 8274942: AssertionError at jdk.compiler/com.sun.tools.javac.util.Assert.error(Assert.java:155)
  • 716eeb0: 8275226: Shenandoah: Relax memory constraint for worker claiming tasks/ranges
  • 01a9e63: 8276864: Update boot JDKs to 17.0.1 in GHA
  • ... and 1 more: https://git.openjdk.java.net/jdk17u/compare/2d69b2d5878ea0da361585e0253cb4ef13213290...master

Your commit was automatically rebased without conflicts.

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

@openjdk openjdk bot commented Nov 23, 2021

@akashche Pushed as commit c47e233.

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

@akashche akashche deleted the 8140241-backport branch Nov 23, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
1 participant