Jeff King <peff@xxxxxxxx> writes:
> When fetching, we send the incoming pack to index-pack (or
> unpack-objects) via the sideband demuxer. If index-pack hits an error
> (e.g., because an object fails fsck), then it will die immediately. This
> may cause us to get SIGPIPE on the fetch, as we're still trying to write
> pack contents from the sideband demuxer (which is typically a thread,
> and thus takes down the whole fetch process).
So, ... we'd die anyway and won't update the refs and anything that
leaves permanent damage to the repository either way, but we choose
a better way to die by not taking SIGPIPE, but to get an error from
one of the write()s or the final close(), which will lead us to more
"controlled" death using the normal error path?
> This is mostly cosmetic. The actual error of interest (in this case, the
> object that failed the fsck check) comes from index-pack straight to
> stderr, so the user still sees it. They _might_ even see fetch-pack
> complaining about index-pack failing, because the main thread is racing
> with the sideband-demuxer. But they'll definitely see the signal death
> in the exit code, which is what the test is complaining about.
OK.
> We can make this more predictable by just ignoring SIGPIPE. The sideband
> demuxer uses write_or_die(), so it will notice and stop (gracefully,
> because we hook die_routine() to exit just the thread). And during this
> section we're not writing anywhere else where we'd be concerned about
> SIGPIPE preventing us from wasting effort writing to nowhere.
OK.
> +#include "sigchain.h"
>
> static int transfer_unpack_limit = -1;
> static int fetch_unpack_limit = -1;
> @@ -956,6 +957,8 @@ static int get_pack(struct fetch_pack_args *args,
> strvec_push(index_pack_args, cmd.args.v[i]);
> }
>
> + sigchain_push(SIGPIPE, SIG_IGN);
> +
> cmd.in = demux.out;
> cmd.git_cmd = 1;
> if (start_command(&cmd))
> @@ -986,6 +989,8 @@ static int get_pack(struct fetch_pack_args *args,
> if (use_sideband && finish_async(&demux))
> die(_("error in sideband demultiplexer"));
>
> + sigchain_pop(SIGPIPE);
> +
> /*
> * Now that index-pack has succeeded, write the promisor file using the
> * obtained .keep filename if necessary
Thanks.
