* [PATCH] enable "no-done" extension only when fetching over smart-http
@ 2011-03-29 17:16 Junio C Hamano
2011-03-29 17:24 ` Shawn Pearce
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-03-29 17:16 UTC (permalink / raw
To: git; +Cc: Shawn O. Pearce
When 'no-done' protocol extension is used, the upload-pack (i.e. the
server side) process stops listening to the fetch-pack after issuing the
final NAK, and starts sending the generated pack data back, but there may
be more "have" send by the latter in flight that the fetch-pack is
expecting to be responded with ACK/NAK. This will typically result in a
deadlock (both will block on write that the other end never reads) or
SIGPIPE on the fetch-pack end (upload-pack will finish writing a small
pack and goes away).
Disable it unless fetch-pack is running under smart-http, where there is
no such streaming issue.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/fetch-pack.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index 59fbda5..52707a8 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -708,7 +708,8 @@ static struct ref *do_fetch_pack(int fd[2],
if (server_supports("no-done")) {
if (args.verbose)
fprintf(stderr, "Server supports no-done\n");
- no_done = 1;
+ if (args.stateless_rpc)
+ no_done = 1;
}
}
else if (server_supports("multi_ack")) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] enable "no-done" extension only when fetching over smart-http
2011-03-29 17:16 [PATCH] enable "no-done" extension only when fetching over smart-http Junio C Hamano
@ 2011-03-29 17:24 ` Shawn Pearce
2011-03-29 17:24 ` [PATCH] enable "no-done" extension only when serving " Junio C Hamano
2011-03-29 17:32 ` Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: Shawn Pearce @ 2011-03-29 17:24 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
On Tue, Mar 29, 2011 at 10:16, Junio C Hamano <gitster@pobox.com> wrote:
> When 'no-done' protocol extension is used, the upload-pack (i.e. the
> server side) process stops listening to the fetch-pack after issuing the
> final NAK, and starts sending the generated pack data back, but there may
> be more "have" send by the latter in flight that the fetch-pack is
> expecting to be responded with ACK/NAK. This will typically result in a
> deadlock (both will block on write that the other end never reads) or
> SIGPIPE on the fetch-pack end (upload-pack will finish writing a small
> pack and goes away).
>
> Disable it unless fetch-pack is running under smart-http, where there is
> no such streaming issue.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
--
Shawn.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] enable "no-done" extension only when serving over smart-http
2011-03-29 17:16 [PATCH] enable "no-done" extension only when fetching over smart-http Junio C Hamano
2011-03-29 17:24 ` Shawn Pearce
@ 2011-03-29 17:24 ` Junio C Hamano
2011-03-29 17:31 ` Shawn Pearce
2011-03-29 17:32 ` Junio C Hamano
2 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2011-03-29 17:24 UTC (permalink / raw
To: Shawn, O.Pearce, " <spearce; +Cc: git
Do not advertise no-done capability when upload-pack is not serving over
smart-http, as there is no way for this server to know when it should stop
reading in-flight data from the client, even though it is necessary to
drain all the in-flight data in order to unblock the client.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
upload-pack.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 5924f6f..a247fb9 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -640,15 +640,16 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
{
static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"
- " include-tag multi_ack_detailed no-done";
+ " include-tag multi_ack_detailed";
struct object *o = parse_object(sha1);
if (!o)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (capabilities)
- packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
- 0, capabilities);
+ packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname,
+ 0, capabilities,
+ stateless_rpc ? " no-done" : "");
else
packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
capabilities = NULL;
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] enable "no-done" extension only when serving over smart-http
2011-03-29 17:24 ` [PATCH] enable "no-done" extension only when serving " Junio C Hamano
@ 2011-03-29 17:31 ` Shawn Pearce
0 siblings, 0 replies; 5+ messages in thread
From: Shawn Pearce @ 2011-03-29 17:31 UTC (permalink / raw
To: Junio C Hamano; +Cc: git
On Tue, Mar 29, 2011 at 10:24, Junio C Hamano <gitster@pobox.com> wrote:
> Do not advertise no-done capability when upload-pack is not serving over
> smart-http, as there is no way for this server to know when it should stop
> reading in-flight data from the client, even though it is necessary to
> drain all the in-flight data in order to unblock the client.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
--
Shawn.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] enable "no-done" extension only when serving over smart-http
2011-03-29 17:16 [PATCH] enable "no-done" extension only when fetching over smart-http Junio C Hamano
2011-03-29 17:24 ` Shawn Pearce
2011-03-29 17:24 ` [PATCH] enable "no-done" extension only when serving " Junio C Hamano
@ 2011-03-29 17:32 ` Junio C Hamano
2 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2011-03-29 17:32 UTC (permalink / raw
To: Shawn O. Pearce; +Cc: git
Do not advertise no-done capability when upload-pack is not serving over
smart-http, as there is no way for this server to know when it should stop
reading in-flight data from the client, even though it is necessary to
drain all the in-flight data in order to unblock the client.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
* Sorry for the resend...
upload-pack.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/upload-pack.c b/upload-pack.c
index 5924f6f..a247fb9 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -640,15 +640,16 @@ static int send_ref(const char *refname, const unsigned char *sha1, int flag, vo
{
static const char *capabilities = "multi_ack thin-pack side-band"
" side-band-64k ofs-delta shallow no-progress"
- " include-tag multi_ack_detailed no-done";
+ " include-tag multi_ack_detailed";
struct object *o = parse_object(sha1);
if (!o)
die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1));
if (capabilities)
- packet_write(1, "%s %s%c%s\n", sha1_to_hex(sha1), refname,
- 0, capabilities);
+ packet_write(1, "%s %s%c%s%s\n", sha1_to_hex(sha1), refname,
+ 0, capabilities,
+ stateless_rpc ? " no-done" : "");
else
packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname);
capabilities = NULL;
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2011-03-29 17:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-29 17:16 [PATCH] enable "no-done" extension only when fetching over smart-http Junio C Hamano
2011-03-29 17:24 ` Shawn Pearce
2011-03-29 17:24 ` [PATCH] enable "no-done" extension only when serving " Junio C Hamano
2011-03-29 17:31 ` Shawn Pearce
2011-03-29 17:32 ` Junio C Hamano
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).