database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Remove unnecessary pg_is_in_recovery calls in tests

Browse Source 
Since pg_ctl promote already waits for recovery to end, these calls are
obsolete.
This commit is contained in:
Peter Eisentraut
2017-05-01 12:11:25 -04:00
parent 1bac5f552a
commit 6deb52b202
5 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/modules/commit_ts/t/003_standby_2.pl
View File

@ -55,8 +55,6 @@ $master->append_conf('postgresql.conf', 'track_commit_timestamp = off');
$master->restart; $master->restart;
system_or_bail('pg_ctl', '-D', $standby->data_dir, 'promote'); system_or_bail('pg_ctl', '-D', $standby->data_dir, 'promote');
$standby->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "standby never exited recovery";
$standby->safe_psql('postgres', "create table t11()"); $standby->safe_psql('postgres', "create table t11()");
my $standby_ts = $standby->safe_psql('postgres', my $standby_ts = $standby->safe_psql('postgres',

2
src/test/recovery/t/008_fsm_truncation.pl
View File

@ -83,8 +83,6 @@ $node_standby->poll_query_until('postgres', $caughtup_query)
# Promote the standby # Promote the standby
$node_standby->promote; $node_standby->promote;
$node_standby->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby";
$node_standby->psql('postgres', 'checkpoint'); $node_standby->psql('postgres', 'checkpoint');
# Restart to discard in-memory copy of FSM # Restart to discard in-memory copy of FSM

6
src/test/recovery/t/009_twophase.pl
View File

@ -215,8 +215,6 @@ $cur_master->psql(
PREPARE TRANSACTION 'xact_009_10';"); PREPARE TRANSACTION 'xact_009_10';");
$cur_master->teardown_node; $cur_master->teardown_node;
$cur_slave->promote; $cur_slave->promote;
$cur_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby " . $cur_slave->name;
# change roles # change roles
note "Now paris is master and london is slave"; note "Now paris is master and london is slave";
@ -254,8 +252,6 @@ $cur_master->psql(
$cur_master->stop; $cur_master->stop;
$cur_slave->restart; $cur_slave->restart;
$cur_slave->promote; $cur_slave->promote;
$cur_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby " . $cur_slave->name;
# change roles # change roles
note "Now london is master and paris is slave"; note "Now london is master and paris is slave";
@ -296,8 +292,6 @@ $cur_master->stop;
$cur_slave->teardown_node; $cur_slave->teardown_node;
$cur_slave->start; $cur_slave->start;
$cur_slave->promote; $cur_slave->promote;
$cur_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby " . $cur_slave->name;
# change roles # change roles
note "Now paris is master and london is slave"; note "Now paris is master and london is slave";

4
src/test/recovery/t/010_logical_decoding_timelines.pl
View File

@ -137,10 +137,6 @@ $node_master->safe_psql('postgres', 'CHECKPOINT');
$node_master->stop('immediate'); $node_master->stop('immediate');
$node_replica->promote; $node_replica->promote;
print "waiting for replica to come up\n";
$node_replica->poll_query_until('postgres',
"SELECT NOT pg_is_in_recovery();")
or die "replica never exited recovery";
$node_replica->safe_psql('postgres', $node_replica->safe_psql('postgres',
"INSERT INTO decoding(blah) VALUES ('after failover');"); "INSERT INTO decoding(blah) VALUES ('after failover');");

6
src/test/recovery/t/012_subtransactions.pl
View File

@ -109,8 +109,6 @@ $node_slave->psql(
is($psql_out, '8128', "Visible"); is($psql_out, '8128', "Visible");
$node_master->stop; $node_master->stop;
$node_slave->promote; $node_slave->promote;
$node_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby";
$node_slave->psql( $node_slave->psql(
'postgres', 'postgres',
@ -162,8 +160,6 @@ $node_slave->psql(
is($psql_out, '-1', "Not visible"); is($psql_out, '-1', "Not visible");
$node_master->stop; $node_master->stop;
$node_slave->promote; $node_slave->promote;
$node_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby";
$node_slave->psql( $node_slave->psql(
'postgres', 'postgres',
@ -205,8 +201,6 @@ $node_slave->psql(
is($psql_out, '-1', "Not visible"); is($psql_out, '-1', "Not visible");
$node_master->stop; $node_master->stop;
$node_slave->promote; $node_slave->promote;
$node_slave->poll_query_until('postgres', "SELECT NOT pg_is_in_recovery()")
or die "Timed out while waiting for promotion of standby";
$node_slave->psql( $node_slave->psql(
'postgres', 'postgres',