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

8297292: java/nio/channels/FileChannel/FileExtensionAndMap.java is too slow #12479

Closed
wants to merge 3 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Feb 9, 2023

Reduce the test’s disk space requirement by one third and the total number of files tested by half. With this change, the test was observed to still fail with a SIGBUS using JDK 11.0.15 on Linux 5.15.0-58. The test’s run time decreased by about two thirds: for one sample run from 29m56s to 10m13s in the CI on Linux-x64. A run with 50 repeats had no failures.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8297292: java/nio/channels/FileChannel/FileExtensionAndMap.java is too slow

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk pull/12479/head:pull/12479
$ git checkout pull/12479

Update a local copy of the PR:
$ git checkout pull/12479
$ git pull https://git.openjdk.org/jdk pull/12479/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 12479

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/12479.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Feb 9, 2023

👋 Welcome back bpb! 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 Feb 9, 2023
@openjdk
Copy link

openjdk bot commented Feb 9, 2023

@bplb 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 nio-dev@openjdk.org label Feb 9, 2023
@mlbridge
Copy link

mlbridge bot commented Feb 9, 2023

Webrevs

Copy link
Member

@jaikiran jaikiran left a comment

Choose a reason for hiding this comment

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

Hello Brian, the change looks fine to me. FileExtensionAndMap.java will need a copyright year update before integrating.

@openjdk
Copy link

openjdk bot commented Feb 9, 2023

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

8297292: java/nio/channels/FileChannel/FileExtensionAndMap.java is too slow

Reviewed-by: jpai

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

  • 4539899: 8301480: Replace NULL with nullptr in os/posix
  • 1428db7: 8301224: Replace NULL with nullptr in share/gc/shared/
  • c25b4f4: 8301578: Perform output outside synchronization in Module.class
  • 5830c03: 8302004: InlineTree should consult replay file in release build
  • c8ace48: 8301072: Replace NULL with nullptr in share/oops/
  • 1c7b09b: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • 837d464: 8302125: Make G1 full gc abort the VM after failing VerifyDuringGC verification
  • 723433d: 8302117: IgnoreUnrecognizedVMOptions flag causes failure in ArchiveHeapTestClass
  • e245620: 8293198: [vectorapi] Improve the implementation of VectorMask.indexInRange()
  • b814cfc: 8178806: Better exception logging in crypto code
  • ... and 30 more: https://git.openjdk.org/jdk/compare/638d612c6b7c08c1f7be0d4e75e9f8a6dca1ef19...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 Pull request is ready to be integrated label Feb 9, 2023
@AlanBateman
Copy link
Contributor

AlanBateman commented Feb 9, 2023

10mins is still very slow for a test in this area, I wonder if there is a better way to test this scenario that would run in a shorter time.

I checked the tier2 runs in our CI and it looks like the slowest FileChannel tests right now take no more than 1m30s, so maybe that is the ballpark should be aiming for on this one.

@bplb
Copy link
Member Author

bplb commented Feb 10, 2023

FileExtensionAndMap.java was added by the change which resolved JDK-8168628. That change was backed out of JDK 11 because it broke sparse files. The underlying issue was really Unsafe::copy[Swap]Memory not using memory guards which was tracked in JDK-8191278. The fix for this latter issue added the test test/hotspot/jtreg/runtime/Unsafe/InternalErrorTest.java which is presumably sufficient to test for the underlying cause for which FileExtensionAndMap.java is also testing. Given this quasi duplication, it appears safe to simply remove FileExtensionAndMap.java altogether.

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.

The deletion looks fine.

@bplb
Copy link
Member Author

bplb commented Feb 10, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Feb 10, 2023

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

  • 57798dd: 6595142: (spec) ByteArrayInputStream treats bytes, not characters
  • 880f52f: 8301638: A number of nsk/jdi invokemethod tests should be converted to create virtual threads
  • db1b48e: 8302167: Avoid allocating register in fast_lock()
  • 582b943: 8278965: crash in SymbolTable::do_lookup
  • 4539899: 8301480: Replace NULL with nullptr in os/posix
  • 1428db7: 8301224: Replace NULL with nullptr in share/gc/shared/
  • c25b4f4: 8301578: Perform output outside synchronization in Module.class
  • 5830c03: 8302004: InlineTree should consult replay file in release build
  • c8ace48: 8301072: Replace NULL with nullptr in share/oops/
  • 1c7b09b: 8302069: javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java update
  • ... and 34 more: https://git.openjdk.org/jdk/compare/638d612c6b7c08c1f7be0d4e75e9f8a6dca1ef19...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Feb 10, 2023
@openjdk openjdk bot closed this Feb 10, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Feb 10, 2023
@openjdk
Copy link

openjdk bot commented Feb 10, 2023

@bplb Pushed as commit 84e4799.

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

@bplb bplb deleted the FileChannl-extensionAndMap-8297292 branch February 14, 2023 20:23
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 nio nio-dev@openjdk.org
Development

Successfully merging this pull request may close these issues.

3 participants