rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

TAP tests: check for postmaster.pid anyway when "pg_ctl start" fails. 

"pg_ctl start" might start a new postmaster and then return failure
anyway, for example if PGCTLTIMEOUT is exceeded.  If there is a
postmaster there, it's still incumbent on us to shut it down at
script end, so check for the PID file even though we are about
to fail.

This has been broken all along, so back-patch to all supported branches.

Discussion: https://postgr.es/m/647439.1642622744@sss.pgh.pa.us
This commit is contained in:
Tom Lane 2022-01-19 16:29:09 -05:00
parent fdb11ad458
commit 5940d1b027
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -778,6 +778,11 @@ sub start
{
print "# pg_ctl start failed; logfile:\n";
print TestLib::slurp_file($self->logfile);
# pg_ctl could have timed out, so check to see if there's a pid file;
# otherwise our END block will fail to shut down the new postmaster.
$self->_update_pid(-1);
BAIL_OUT("pg_ctl start failed") unless $params{fail_ok};
return 0;
}
@ -1019,7 +1024,10 @@ archive_command = '$copy_command'
return;
}
# Internal method
# Internal method to update $self->{_pid}
# $is_running = 1: pid file should be there
# $is_running = 0: pid file should NOT be there
# $is_running = -1: we aren't sure
sub _update_pid
{
my ($self, $is_running) = @_;
@ -1034,7 +1042,7 @@ sub _update_pid
close $pidfile;
# If we found a pidfile when there shouldn't be one, complain.
BAIL_OUT("postmaster.pid unexpectedly present") unless $is_running;
BAIL_OUT("postmaster.pid unexpectedly present") if $is_running == 0;
return;
}
@ -1042,7 +1050,7 @@ sub _update_pid
print "# No postmaster PID for node \"$name\"\n";
# Complain if we expected to find a pidfile.
BAIL_OUT("postmaster.pid unexpectedly not present") if $is_running;
BAIL_OUT("postmaster.pid unexpectedly not present") if $is_running == 1;
return;
}