From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, Jonathan Tan <jonathantanmy@google.com>,
Jeff King <peff@peff.net>
Subject: Re: [PATCH v2 1/3] sideband: avoid reporting incomplete sideband messages
Date: Tue, 20 Oct 2020 22:48:09 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.2010202246240.56@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqwnzkab85.fsf@gitster.c.googlers.com>
Hi Junio,
On Tue, 20 Oct 2020, Junio C Hamano wrote:
> "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?
Sure.
I had not added that because I had actually come up with the fix
independently in my analysis before I read Peff's reply thoroughly.
But credit where credit is due: without Peff's reply, I would not have
worked on the full fix and stayed with the work-around.
Ciao,
Dscho
next prev parent reply other threads:[~2020-10-20 20:48 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
2020-10-20 20:48 ` Johannes Schindelin [this message]
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.2010202246240.56@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.