Skip to contentSkip to conversation

jgit: upload-pack: Force an fd flush after receiving flush pkt from client

PATCH Applied Dima Zavin 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore

Dima Zavin

author
#0 lore raw

PATCH 1/1 jgit: upload-pack: Force an fd flush after receiving flush pkt from client

Signed-off-by Dima Zavin <[email protected]>
---
 .../src/org/spearce/jgit/transport/UploadPack.java |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java +1 -2
index 71acda1..80c154b 100644
@@ -351,7 +351,7 @@ private void negotiate() throws IOException {
 			if (line.length() == 0) {
 				if (commonBase.isEmpty() || multiAck)
 					pckOut.writeString("NAK\n");
-
+				pckOut.flush();
 			} else if (line.startsWith("have ") && line.length() == 45) {
 				final ObjectId id = ObjectId.fromString(line.substring(5));
 				if (matchHave(id)) {

@@ -372,7 +372,6 @@ private void negotiate() throws IOException {
 			} else if (line.equals("done")) {
 				if (commonBase.isEmpty())
 					pckOut.writeString("NAK\n");
-
 				else if (multiAck)
 					pckOut.writeString("ACK " + last.name() + "\n");
 				break;
Signature · 1 line
1.6.2
Applied
#1 lore raw

org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java private void negotiate() throws IOException { · line 357

Quoted 13 lines · Dima Zavin
org.spearce.jgit/src/org/spearce/jgit/transport/UploadPack.java +1 -1
index 71acda1..80c154b 100644
@@ -351,7 +351,7 @@ private void negotiate() throws IOException {
 			if (line.length() == 0) {
 				if (commonBase.isEmpty() || multiAck)
 					pckOut.writeString("NAK\n");
-
+				pckOut.flush();
 			} else if (line.startsWith("have ") && line.length() == 45) {
 				final ObjectId id = ObjectId.fromString(line.substring(5));
 				if (matchHave(id)) {

Applied, but with this more verbose commit message:

--8<--
upload-pack: Force an fd flush after receiving flush pkt from client

The client is blocked waiting for an ACK or NAK line from the server. If we don't call flush() here there is a very good chance the ACK/NAK is stuck in our stream buffer within the JRE, and doesn't make it into the kernel's TCP buffer. This causes the server to wait for more have lines, and the client to wait for the ACK/NAK, and the entire thing just deadlocks.

We flush anytime we see a pkt-line flush command, as there may be buffered ACK lines from prior evaulations that need to be sent to the waiting client.

Signed-off-by Dima Zavin <[email protected]>
Signed-off-by Shawn O. Pearce <[email protected]>

---

Signature · 1 line
Shawn.