Invalidate buffered data when bypassing the cache #80432
Conversation
|
Tagging subscribers to this area: @dotnet/area-system-io |
src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs
Outdated
Show resolved
Hide resolved
| @@ -318,6 +318,8 @@ public override ValueTask<int> ReadAsync(Memory<byte> buffer, CancellationToken | |||
| { | |||
| if (_readLen == _readPos && buffer.Length >= _bufferSize) | |||
| { | |||
| // invalidate the buffered data, otherwise certain Seek operation followed by a ReadAsync could try to re-use data from _buffer | |||
| _readPos = _readLen = 0; | |||
There was a problem hiding this comment.
This is on the ReadAsync path. Is there any similar issue on the Read path? What about in BufferedStream? Just want to make sure we've audited all similar code paths that could have a similar issue.
There was a problem hiding this comment.
Is there any similar issue on the Read path?
There is not, and the test that I've added ensures this.
What about in BufferedStream?
This particular optimization was not ported to BufferedStream. But I can add a BufferedStream test to be 100% sure.
Just want to make sure we've audited all similar code paths that could have a similar issue.
Sure, that is a very good point. I've verified that neither Read or Write/WriteAsync suffer from same issue.
|
/backport to release/6.0 |
|
/backport to release/7.0 |
|
Started backporting to release/6.0: https://github.com/dotnet/runtime/actions/runs/3894075864 |
|
Started backporting to release/7.0: https://github.com/dotnet/runtime/actions/runs/3894077772 |
|
@adamsitnik backporting to release/6.0 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: add a failing test
Using index info to reconstruct a base tree...
M src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs
Falling back to patching base and 3-way merge...
Auto-merging src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs
Applying: fix
Applying: address code review feedback
Applying: test BufferedStream as well
error: sha1 information is lacking or useless (src/libraries/System.IO.FileSystem/tests/FileStream/ReadAsync.cs).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 test BufferedStream as well
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 128Please backport manually! |
|
@adamsitnik an error occurred while backporting to release/6.0, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
ghost
locked as resolved and limited conversation to collaborators
This PR fixes a very nasty bug reported by @yeunglee in #80344. It will require a backport to both 7.0 and 6.0
To get a better understanding of it PTAL at the test and the comments I've added.
fixes #80344