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.

Sign up for GitHub

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

Fix for #747 'git fetch' sporadically hangs, GitServiceExecutor now asynchronous. #840

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix for #747 'git fetch' sporadically hangs, GitServiceExecutor now asynchronous. #840

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec10d08
Fixed git deadlock bug in GitServiceExecutor. Fault due to stdIn and …
Jul 4, 2019
dbabdd4
removed trailing white-space.
Jul 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions Bonobo.Git.Server/Git/GitService/GitServiceExecutor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;

namespace Bonobo.Git.Server.Git.GitService
{
Expand Down Expand Up @@ -93,15 +95,41 @@ public void ExecuteServiceByName(

using (var process = Process.Start(info))
{
inStream.CopyTo(process.StandardInput.BaseStream);
if (options.endStreamWithClose) {
process.StandardInput.Close();
} else {
process.StandardInput.Write('\0');
}
//Do asynchronous copy i.e. spin up a separate task so we can simultaneously read/write &
//avoid deadlock due to filled buffers within git process
Task stdInTask = inStream.CopyToAsync(process.StandardInput.BaseStream);

//Don't bother waiting on completion of stdOutTask while process is running.
//task will be sitting idle waiting for new bytes on stdOut of git
Task stdOutTask = process.StandardOutput.BaseStream.CopyToAsync(outStream);

//wait for process death and ensure all data is sent and received
bool completionJobDone = false;
while (true)
{
//check if all output has been sent to git exe via stdin
if ((stdInTask.IsCompleted) && (completionJobDone==false))
{
//all output has been sent to git process, send final signal.
if (options.endStreamWithClose)
{
process.StandardInput.Close();
}
else
{
process.StandardInput.Write('\0');
}
completionJobDone = true;
}

process.StandardOutput.BaseStream.CopyTo(outStream);
process.WaitForExit();
//check if git has terminated
if (process.HasExited)
break;

//lets not hog all the CPU, sleep for a little while (20ms)
Thread.Sleep(20);
}
stdOutTask.Wait();
}
}

Expand Down