Skip to content

Commit 61c0962

Browse files
committed
When Perl "kill(9, ...)" fails, try "pg_ctl kill".
Per buildfarm member jacana, the former fails under msys Perl 5.8.8. Back-patch to 9.6, like the code in question. Discussion: https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se
1 parent d4c50b4 commit 61c0962

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/test/perl/PostgresNode.pm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,9 @@ sub kill9
734734
my $name = $self->name;
735735
return unless defined $self->{_pid};
736736
print "### Killing node \"$name\" using signal 9\n";
737-
kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed");
737+
# kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl.
738+
kill(9, $self->{_pid})
739+
or TestLib::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid});
738740
$self->{_pid} = undef;
739741
return;
740742
}

0 commit comments

Comments
 (0)