From: Junio C Hamano <gitster@pobox.com>
To: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>,
Jeff King <peff@peff.net>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: [PATCH v2 1/3] sideband: avoid reporting incomplete sideband messages
Date: Tue, 20 Oct 2020 13:33:46 -0700 [thread overview]
Message-ID: <xmqqwnzkab85.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <e4ba96358b7c5d2b4148c5529a3c253dc0d1f358.1603136143.git.gitgitgadget@gmail.com> (Johannes Schindelin via GitGitGadget's message of "Mon, 19 Oct 2020 19:35:40 +0000")
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
writes:
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> In 2b695ecd74d (t5500: count objects through stderr, not trace,
> 2020-05-06) we tried to ensure that the "Total 3" message could be
> grepped in Git's output, even if it sometimes got chopped up into
> multiple lines in the trace machinery.
> ...
> The correct way to fix this is to return from `demultiplex_sideband()`
> early. The caller will then write out the contents of the primary packet
> and continue looping. The `scratch` buffer for incomplete sideband
> messages is owned by that caller, and will continue to accumulate the
> remainder(s) of those messages. The loop will only end once
> `demultiplex_sideband()` returned non-zero _and_ did not indicate a
> primary packet, which is the case only when we hit the `cleanup:` path,
> in which we take care of flushing any unfinished sideband messages and
> release the `scratch` buffer.
>
> To ensure that this does not get broken again, we introduce a pair of
> subcommands of the `pkt-line` test helper that specifically chop up the
> sideband message and squeeze a primary packet into the middle.
>
> Final note: The other test case touched by 2b695ecd74d (t5500: count
> objects through stderr, not trace, 2020-05-06) is not affected by this
> issue because the sideband machinery is not involved there.
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
Nicely explained. Do we want to also give credit to Peff for the
single-liner fix here, perhaps with a suggested/helped-by trailer?
> sideband.c | 2 +-
> t/helper/test-pkt-line.c | 23 +++++++++++++++++++++++
> t/t0070-fundamental.sh | 6 ++++++
> 3 files changed, 30 insertions(+), 1 deletion(-)
>
> diff --git a/sideband.c b/sideband.c
> index 0a60662fa6..a5405b9aaa 100644
> --- a/sideband.c
> +++ b/sideband.c
> @@ -190,7 +190,7 @@ int demultiplex_sideband(const char *me, char *buf, int len,
> return 0;
> case 1:
> *sideband_type = SIDEBAND_PRIMARY;
> - break;
> + return 1;
> default:
> strbuf_addf(scratch, "%s%s: protocol error: bad band #%d",
> scratch->len ? "\n" : "", me, band);
> diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c
> index 69152958e5..0bf20642be 100644
> --- a/t/helper/test-pkt-line.c
> +++ b/t/helper/test-pkt-line.c
> @@ -84,6 +84,25 @@ static void unpack_sideband(void)
> }
> }
>
> +static int send_split_sideband(void)
> +{
> + const char *part1 = "Hello,";
> + const char *primary = "\001primary: regular output\n";
> + const char *part2 = " world!\n";
> +
> + send_sideband(1, 2, part1, strlen(part1), LARGE_PACKET_MAX);
> + packet_write(1, primary, strlen(primary));
> + send_sideband(1, 2, part2, strlen(part2), LARGE_PACKET_MAX);
> + packet_response_end(1);
> +
> + return 0;
> +}
OK.
> +static int receive_sideband(void)
> +{
> + return recv_sideband("sideband: ", 0, 1);
> +}
> +
> int cmd__pkt_line(int argc, const char **argv)
> {
> if (argc < 2)
> @@ -95,6 +114,10 @@ int cmd__pkt_line(int argc, const char **argv)
> unpack();
> else if (!strcmp(argv[1], "unpack-sideband"))
> unpack_sideband();
> + else if (!strcmp(argv[1], "send-split-sideband"))
> + send_split_sideband();
> + else if (!strcmp(argv[1], "receive-sideband"))
> + receive_sideband();
> else
> die("invalid argument '%s'", argv[1]);
>
> diff --git a/t/t0070-fundamental.sh b/t/t0070-fundamental.sh
> index 7b111a56fd..357201640a 100755
> --- a/t/t0070-fundamental.sh
> +++ b/t/t0070-fundamental.sh
> @@ -34,4 +34,10 @@ test_expect_success 'check for a bug in the regex routines' '
> test-tool regex --bug
> '
>
> +test_expect_success 'incomplete sideband messages are reassembled' '
> + test-tool pkt-line send-split-sideband >split-sideband &&
> + test-tool pkt-line receive-sideband <split-sideband 2>err &&
> + grep "Hello, world" err
> +'
> +
> test_done
next prev parent reply other threads:[~2020-10-20 20:33 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 14:45 [PATCH] t5500.43: make the check a bit more robust Johannes Schindelin via GitGitGadget
2020-10-13 17:53 ` Junio C Hamano
2020-10-13 18:55 ` Jeff King
2020-10-13 19:07 ` Junio C Hamano
2020-10-13 19:09 ` Jeff King
2020-10-17 3:31 ` Johannes Schindelin
2020-10-17 2:34 ` Johannes Schindelin
2020-10-19 19:35 ` [PATCH v2 0/3] Work around flakiness in t5500.43 Johannes Schindelin via GitGitGadget
2020-10-19 19:35 ` [PATCH v2 1/3] sideband: avoid reporting incomplete sideband messages Johannes Schindelin via GitGitGadget
2020-10-20 20:33 ` Junio C Hamano [this message]
2020-10-20 20:48 ` Johannes Schindelin
2020-10-20 21:33 ` Junio C Hamano
2020-10-19 19:35 ` [PATCH v2 2/3] sideband: report unhandled incomplete sideband messages as bugs Johannes Schindelin via GitGitGadget
2020-10-19 19:35 ` [PATCH v2 3/3] sideband: add defense against packets missing a band designator Johannes Schindelin via GitGitGadget
2020-10-20 20:36 ` Junio C Hamano
2020-10-23 8:34 ` Jeff King
2020-10-23 14:44 ` Junio C Hamano
2020-10-23 8:48 ` Jeff King
2020-10-23 5:36 ` Johannes Schindelin
2020-10-23 8:50 ` [PATCH v2 0/3] Work around flakiness in t5500.43 Jeff King
2020-10-26 16:04 ` Johannes Schindelin
2020-10-26 16:09 ` [PATCH v3 0/2] " Johannes Schindelin via GitGitGadget
2020-10-26 16:09 ` [PATCH v3 1/2] sideband: avoid reporting incomplete sideband messages Johannes Schindelin via GitGitGadget
2020-10-26 16:09 ` [PATCH v3 2/2] sideband: report unhandled incomplete sideband messages as bugs Johannes Schindelin via GitGitGadget
2020-10-26 18:33 ` [PATCH v3 0/2] Work around flakiness in t5500.43 Junio C Hamano
2020-10-27 6:52 ` [PATCH] sideband: diagnose more incoming packet anomalies Jeff King
2020-10-27 7:12 ` Jeff King
2020-10-27 18:56 ` Junio C Hamano
2020-10-27 20:42 ` Jeff King
2020-10-27 21:38 ` Junio C Hamano
2020-10-28 9:33 ` Jeff King
2020-10-27 7:13 ` Jeff King
2020-10-27 19:04 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwnzkab85.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=jonathantanmy@google.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).