database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-22 23:02:54 +03:00
Code

Make new crash restart test a bit more robust.

Browse Source 
Add timeouts in case psql doesn't deliver the expected output, and try
to cause the monitoring psql to be fully connected to a backend.  This
isn't necessarily everything needed, but at least the timeouts should
reduce the pain for buildfarm owners.

Author: Andres Freund
Reported-By: Tom Lane, BF animals prairiedog and calliphoridae
Discussion: https://postgr.es/m/E1du6ZT-00043I-91@gemulon.postgresql.org
This commit is contained in:
Andres Freund 2017-09-19 10:32:51 -07:00
parent d61f5bb7c4
commit 1910353675
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/recovery/t/013_crash_restart.pl
View File

@ -27,6 +27,12 @@ else
plan tests => 12; plan tests => 12;
} }
# To avoid hanging while expecting some specific input from a psql
# instance being driven by us, add a timeout high enough that it
# should never trigger in a normal run, but low enough to actually see
# failures in a realistic amount of time.
my $psql_timeout = 180;
my $node = get_new_node('master'); my $node = get_new_node('master');
$node->init(allows_streaming => 1); $node->init(allows_streaming => 1);
$node->start(); $node->start();
@ -47,7 +53,8 @@ my $killme = IPC::Run::start(
'>', '>',
\$killme_stdout, \$killme_stdout,
'2>', '2>',
\$killme_stderr); \$killme_stderr,
IPC::Run::timeout($psql_timeout));
# Need a second psql to check if crash-restart happened. # Need a second psql to check if crash-restart happened.
my ($monitor_stdin, $monitor_stdout, $monitor_stderr) = ('', '', ''); my ($monitor_stdin, $monitor_stdout, $monitor_stderr) = ('', '', '');
@ -59,7 +66,8 @@ my $monitor = IPC::Run::start(
'>', '>',
\$monitor_stdout, \$monitor_stdout,
'2>', '2>',
\$monitor_stderr); \$monitor_stderr,
IPC::Run::timeout($psql_timeout));
#create table, insert row that should survive #create table, insert row that should survive
$killme_stdin .= q[ $killme_stdin .= q[
@ -82,11 +90,13 @@ $killme_stdout = '';
# Start longrunning query in second session, it's failure will signal # Start longrunning query in second session, it's failure will signal
# that crash-restart has occurred. # that crash-restart has occurred. The initial wait for the trivial
# select is to be sure that psql successfully connected to backend.
$monitor_stdin .= q[ $monitor_stdin .= q[
SELECT $$psql-connected$$;
SELECT pg_sleep(3600); SELECT pg_sleep(3600);
]; ];
$monitor->pump; $monitor->pump until $monitor_stdout =~ /psql-connected/;
# kill once with QUIT - we expect psql to exit, while emitting error message first # kill once with QUIT - we expect psql to exit, while emitting error message first
@ -137,18 +147,16 @@ INSERT INTO alive VALUES($$in-progress-before-sigkill$$) RETURNING status;
$killme->pump until $killme_stdout =~ /in-progress-before-sigkill/; $killme->pump until $killme_stdout =~ /in-progress-before-sigkill/;
$killme_stdout = ''; $killme_stdout = '';
$monitor_stdin .= q[ # Re-start longrunning query in second session, it's failure will
SELECT $$restart$$; # signal that crash-restart has occurred. The initial wait for the
]; # trivial select is to be sure that psql successfully connected to
$monitor->pump until $monitor_stdout =~ /restart/; # backend.
$monitor_stdout = '';
# Re-start longrunning query in second session, it's failure will signal
# that crash-restart has occurred.
$monitor_stdin = q[ $monitor_stdin = q[
SELECT $$psql-connected$$;
SELECT pg_sleep(3600); SELECT pg_sleep(3600);
]; ];
$monitor->pump_nb; # don't wait for query results to come back $monitor->pump until $monitor_stdout =~ /psql-connected/;
$monitor_stdout = '';
# kill with SIGKILL this time - we expect the backend to exit, without # kill with SIGKILL this time - we expect the backend to exit, without