From: Noah Misch <noah@leadboat.com>
Date: Sat, 13 Apr 2019 18:09:27 +0000 (-0700)
Subject: When Perl "kill(9, ...)" fails, try "pg_ctl kill".
X-Git-Tag: REL9_6_13~24
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55926b0a091793952f7a2bd130e0032d8309a287;p=postgresql

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
---

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index fd2a67c8c9..f8e38ab489 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -725,7 +725,9 @@ sub kill9
 	my $name = $self->name;
 	return unless defined $self->{_pid};
 	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;
 	return;
 }