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

Move NoInt32OverflowInTheBufferingLogic to OuterLoop #60606

Merged
merged 1 commit into from
Oct 19, 2021

Conversation

jozkee
Copy link
Member

@jozkee jozkee commented Oct 19, 2021

@jozkee jozkee added this to the 7.0.0 milestone Oct 19, 2021
@jozkee jozkee self-assigned this Oct 19, 2021
@ghost
Copy link

ghost commented Oct 19, 2021

Tagging subscribers to this area: @dotnet/area-system-io
See info in area-owners.md if you want to be subscribed.

Issue Details

It appears to be a long running test in CI: https://dev.azure.com/dnceng/public/_build/results?buildId=1424571&view=ms.vss-test-web.build-test-results-tab&runId=41213488&resultId=193806&paneView=dotnet-dnceng.dnceng-build-release-tasks.helix-test-information-tab

In addition, this PR addresses some suggestions left in #60459.

Author: Jozkee
Assignees: Jozkee
Labels:

area-System.IO

Milestone: 7.0.0

Copy link
Member

@adamsitnik adamsitnik left a comment

Choose a reason for hiding this comment

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

LGTM, thank you for doing this @jozkee !

@jozkee
Copy link
Member Author

jozkee commented Dec 17, 2021

/backport to release/6.0

@dotnet dotnet unlocked this conversation Dec 21, 2021
@akoeplinger
Copy link
Member

akoeplinger commented Dec 21, 2021

FYI you need to unlock a locked issue otherwise the backport bot can't post comments on it.

This is also failing on coreclr windows x64 on #63014 too due to being "long running".

/backport to release/6.0

@github-actions
Copy link
Contributor

Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/1604538761

@github-actions
Copy link
Contributor

@akoeplinger backporting to release/6.0 failed, the patch most likely resulted in conflicts:

$ git am --3way --ignore-whitespace --keep-non-patch changes.patch

Applying: Move NoInt32OverflowInTheBufferingLogic to OuterLoop and address pending feedback
Using index info to reconstruct a base tree...
M	src/libraries/System.IO.FileSystem/tests/FileStream/Read.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.IO.FileSystem/tests/FileStream/Read.cs
CONFLICT (content): Merge conflict in src/libraries/System.IO.FileSystem/tests/FileStream/Read.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Move NoInt32OverflowInTheBufferingLogic to OuterLoop and address pending feedback
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

Please backport manually!

@akoeplinger
Copy link
Member

@jozkee oh well, looks like this will need to be done manually anyway 😄

jozkee added a commit to jozkee/runtime that referenced this pull request Dec 21, 2021
danmoseley added a commit that referenced this pull request Dec 31, 2021
)

* Move NoInt32OverflowInTheBufferingLogic to OuterLoop and address pending feedback (#60606)

* Don't create multiple large files at the same time (#62519)

* move existing large file tests into a separate type (no code changes)

* don't run the large file tests in parallel

* use FileOptions.DeleteOnClose to ensure that each test removes it's own file

use single large file to test File.ReadAllBytes and ile.ReadAllBytesAsync for both limits

* Fix DisableParallelization build issue

* Apply suggestions from code review

Co-authored-by: Adam Sitnik <[email protected]>

* Update src/libraries/System.IO.FileSystem/tests/LargeFileTests.cs

Co-authored-by: Adam Sitnik <[email protected]>

* Notepad with uppercase (#62487)

Co-authored-by: Adam Sitnik <[email protected]>
Co-authored-by: Dan Moseley <[email protected]>
@ghost ghost locked as resolved and limited conversation to collaborators Jan 20, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants