fix(RevisionReader): Avoid hang on lengthy StandardOutput #12072
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
RussKie
reviewed
Nov 28, 2024
| @@ -184,13 +201,21 @@ public IReadOnlyCollection<GitRevision> GetRevisionsFromRange(string olderCommit | |||
| Debug.WriteLine($"git {arguments}"); | |||
| #endif | |||
| using IProcess process = _module.GitCommandRunner.RunDetached(cancellationToken, arguments, redirectOutput: true, outputEncoding: null); | |||
| string errorOutput = process.StandardError.ReadToEnd(); | |||
|
|
|||
| // StandardError.ReadToEnd[Async] hangs if lengthy StandardOutput is not consumed in parallel. So, buffer the StandardOutput | |||
There was a problem hiding this comment.
Suggested change
| // StandardError.ReadToEnd[Async] hangs if lengthy StandardOutput is not consumed in parallel. So, buffer the StandardOutput | |
| // StandardError.ReadToEnd[Async] may become unresponsive, if lengthy StandardOutput is not consumed in parallel. So, buffer the StandardOutput. |
| string errorOutput = process.StandardError.ReadToEnd(); | ||
|
|
||
| // StandardError.ReadToEnd[Async] hangs if lengthy StandardOutput is not consumed in parallel. So, buffer the StandardOutput | ||
| MemoryStream standardOutputBuffer = new(); |
There was a problem hiding this comment.
Suggested change
| MemoryStream standardOutputBuffer = new(); | |
| using MemoryStream standardOutputBuffer = new(); |
mstv
added a commit
to mstv/gitextensions
that referenced
this pull request
Dec 2, 2024
mstv
added a commit
to mstv/gitextensions
that referenced
this pull request
Dec 2, 2024
36127ec to
126043a
Compare
126043a to
51dd817
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #12055
Proposed changes
RevisionReader.GetRevision): Avoid hang inStandardError.ReadToEndon lengthyStandardOutputGitCommandRunner.RunDetachedare not affected as they do not readStandardErrorat all.GetRevisionAsyncas proposed by Roslyn analyzerScreenshots
N/A
Test methodology
Test environment(s)
https://github.com/mstv/test_lfs/tree/test_long_commit_body
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.