Fix EGit deadlock listing branches of SSH remote
When listing branches, EGit only reads the advertisement and then disconnects. When it closes down the pack channel the remote side is waiting for the client to send our list of commands, or a flush-pkt to let it know there is nothing to do. However if an error thread is open watching the SSH stderr stream, we ask for it to finish before we send the flush-pkt. Unfortunately the thread won't terminate until the main output stream closes, which is waiting for the flush-pkt. A classic network deadlock. If the output stream needs a flush-pkt we send it before we wait for the error stream to close. If the flush-pkt is rejected, we close down the output stream early, assuming that the remote side is broken and we will get error information soon. Change-Id: I8d078a339077756220c113f49d206b1bf295d434 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
7182fbc422
commit
0dc93a2f4a
|
@ -282,8 +282,10 @@ private PackProtocolException duplicateAdvertisement(final String name) {
|
|||
public void close() {
|
||||
if (out != null) {
|
||||
try {
|
||||
if (outNeedsEnd)
|
||||
if (outNeedsEnd) {
|
||||
outNeedsEnd = false;
|
||||
pckOut.end();
|
||||
}
|
||||
out.close();
|
||||
} catch (IOException err) {
|
||||
// Ignore any close errors.
|
||||
|
@ -314,4 +316,23 @@ public void close() {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Tell the peer we are disconnecting, if it cares to know. */
|
||||
protected void endOut() {
|
||||
if (outNeedsEnd && out != null) {
|
||||
try {
|
||||
outNeedsEnd = false;
|
||||
pckOut.end();
|
||||
} catch (IOException e) {
|
||||
try {
|
||||
out.close();
|
||||
} catch (IOException err) {
|
||||
// Ignore any close errors.
|
||||
} finally {
|
||||
out = null;
|
||||
pckOut = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -264,6 +264,8 @@ class SshFetchConnection extends BasePackFetchConnection {
|
|||
|
||||
@Override
|
||||
public void close() {
|
||||
endOut();
|
||||
|
||||
if (errorThread != null) {
|
||||
try {
|
||||
errorThread.join();
|
||||
|
@ -331,6 +333,8 @@ class SshPushConnection extends BasePackPushConnection {
|
|||
|
||||
@Override
|
||||
public void close() {
|
||||
endOut();
|
||||
|
||||
if (errorThread != null) {
|
||||
try {
|
||||
errorThread.join();
|
||||
|
|
Loading…
Reference in New Issue