Re: [PATCH 3/4] t/lib-git-p4: silence output when killing p4d and its watchdog
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 2, 2026, 13:16 UTC
- Message-ID
- <xmqqtsrlw09t.fsf@gitster.g>
- In-Reply-To
- <ah6uZ6tdIh38X2uZ@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
Show 24 quoted lines
> On Tue, Jun 02, 2026 at 06:32:55PM +0900, Junio C Hamano wrote:
>> Patrick Steinhardt <ps@pks.im> writes:
>>
>> > stop_p4d_and_watchdog () {
>> > kill -9 $p4d_pid $watchdog_pid
>> > + wait $p4d $watchdog_pid 2>/dev/null
>> > }
>>
>> Shoudln't we be waiting on $p4d_pid (not $p4d)...
>>
>> > @@ -175,7 +176,7 @@ retry_until_success () {
>> >
>> > stop_and_cleanup_p4d () {
>> > kill -9 $p4d_pid $watchdog_pid
>> > - wait $p4d_pid
>> > + wait $p4d_pid $watchdog_pid 2>/dev/null
>> > rm -rf "$db" "$cli" "$pidfile"
>> > }
>>
>> ... like we do here?
>
> Oh, good catch. The statement basically doesn't do anything, which isn't
> much of a problem because we really only care about silencing the error
> message when the watchdog is being terminated. Will fix.Thanks. Another thing I noticed is that they look suspiciously similar.