mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When Perl "kill(9, ...)" fails, try "pg_ctl kill".

Browse Source 
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
This commit is contained in:
Noah Misch 2019-04-13 11:09:27 -07:00
parent 5f1433ac5e
commit 947a35014f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/perl/PostgresNode.pm
View File

@ -789,7 +789,9 @@ sub kill9
my $name = $self->name; my $name = $self->name;
return unless defined $self->{_pid}; return unless defined $self->{_pid};
print "### Killing node \"$name\" using signal 9\n"; print "### Killing node \"$name\" using signal 9\n";
kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed"); # kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl.
kill(9, $self->{_pid})
or TestLib::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid});
$self->{_pid} = undef; $self->{_pid} = undef;
return; return;
} }