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

8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output #10479

Closed
wants to merge 2 commits into from

Conversation

bplb
Copy link
Member

@bplb bplb commented Sep 29, 2022

  1. Change source from /proc/cpuinfo to /proc/version.
  2. Do not swallow errors in @BeforeTest config action.
  3. Remove test from problem list.

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-8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10479

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 29, 2022

👋 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 Sep 29, 2022
@openjdk
Copy link

openjdk bot commented Sep 29, 2022

@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 Sep 29, 2022
@mlbridge
Copy link

mlbridge bot commented Sep 29, 2022

Webrevs

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.

file /proc/version reports that it is empty but you can read content, so I think it works to exercise the code paths.

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

8294519: (fs) java/nio/file/Files/CopyProcFile.java fails intermittenly due to unstable /proc/cpuinfo output

Reviewed-by: alanb, shade, lancea

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

  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • aeef3ec: 8294198: Implement isFinite intrinsic for RISC-V
  • 5f6ad92: 8294547: HotSpotAgent.setupVM() should include "cause" exception when throwing DebuggerException
  • 545ded1: 8294548: Problem list SA core file tests on macosx-x64 due to JDK-8294316
  • 29c70f1: 8294595: Add javax/swing/plaf/aqua/CustomComboBoxFocusTest.java to problem list
  • 5d48da4: 8294370: Fix allocation bug in java_lang_Thread::async_get_stack_trace()
  • ce85cac: 8065554: MatchResult should provide values of named-capturing groups
  • 1decdce: 8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
  • 8491fd5: 8294551: Put java/io/BufferedInputStream/TransferTo.java on problem list

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.

➡️ 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 Sep 29, 2022
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

Looks okay to me, and test passes on the system where it failed before.

}
if (Files.mismatch(Path.of(BUFFERED_COPY), Path.of(SOURCE)) != -1)
Copy link
Member

Choose a reason for hiding this comment

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

Braces?

@bplb
Copy link
Member Author

bplb commented Sep 29, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Sep 29, 2022

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

  • 88062ee: 8293969: breakup the long signature in SystemDictionaryShared::is_supported_invokedynamic
  • aeef3ec: 8294198: Implement isFinite intrinsic for RISC-V
  • 5f6ad92: 8294547: HotSpotAgent.setupVM() should include "cause" exception when throwing DebuggerException
  • 545ded1: 8294548: Problem list SA core file tests on macosx-x64 due to JDK-8294316
  • 29c70f1: 8294595: Add javax/swing/plaf/aqua/CustomComboBoxFocusTest.java to problem list
  • 5d48da4: 8294370: Fix allocation bug in java_lang_Thread::async_get_stack_trace()
  • ce85cac: 8065554: MatchResult should provide values of named-capturing groups
  • 1decdce: 8294492: RISC-V: Use li instead of patchable movptr at non-patchable callsites
  • 8491fd5: 8294551: Put java/io/BufferedInputStream/TransferTo.java on problem list

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 29, 2022

@bplb Pushed as commit a07975b.

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

@bplb bplb deleted the CopyProcFile-8294519 branch November 1, 2022 23:31
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
4 participants