Commit6deb52b

committed

Remove unnecessary pg_is_in_recovery calls in tests

Since pg_ctl promote already waits for recovery to end, these calls areobsolete.

1 parent1bac5f5 commit6deb52bCopy full SHA for 6deb52b

File tree

-20

lines changed

-20

lines changed

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -55,8 +55,6 @@`
`55`	`55`	`$master->restart;`
`56`	`56`
`57`	`57`	`system_or_bail('pg_ctl','-D',$standby->data_dir,'promote');`
`58`		`-$standby->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`59`		`-ordie"standby never exited recovery";`
`60`	`58`
`61`	`59`	`$standby->safe_psql('postgres',"create table t11()");`
`62`	`60`	`my$standby_ts =$standby->safe_psql('postgres',`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,6 @@`
`83`	`83`
`84`	`84`	`# Promote the standby`
`85`	`85`	`$node_standby->promote;`
`86`		`-$node_standby->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`87`		`-ordie"Timed out while waiting for promotion of standby";`
`88`	`86`	`$node_standby->psql('postgres','checkpoint');`
`89`	`87`
`90`	`88`	`# Restart to discard in-memory copy of FSM`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,6 @@ sub configure_and_reload`
`215`	`215`	`PREPARE TRANSACTION 'xact_009_10';");`
`216`	`216`	`$cur_master->teardown_node;`
`217`	`217`	`$cur_slave->promote;`
`218`		`-$cur_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`219`		`-ordie"Timed out while waiting for promotion of standby" .$cur_slave->name;`
`220`	`218`
`221`	`219`	`# change roles`
`222`	`220`	`note"Now paris is master and london is slave";`
`@@ -254,8 +252,6 @@ sub configure_and_reload`
`254`	`252`	`$cur_master->stop;`
`255`	`253`	`$cur_slave->restart;`
`256`	`254`	`$cur_slave->promote;`
`257`		`-$cur_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`258`		`-ordie"Timed out while waiting for promotion of standby" .$cur_slave->name;`
`259`	`255`
`260`	`256`	`# change roles`
`261`	`257`	`note"Now london is master and paris is slave";`
`@@ -296,8 +292,6 @@ sub configure_and_reload`
`296`	`292`	`$cur_slave->teardown_node;`
`297`	`293`	`$cur_slave->start;`
`298`	`294`	`$cur_slave->promote;`
`299`		`-$cur_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`300`		`-ordie"Timed out while waiting for promotion of standby" .$cur_slave->name;`
`301`	`295`
`302`	`296`	`# change roles`
`303`	`297`	`note"Now paris is master and london is slave";`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -137,10 +137,6 @@`
`137`	`137`	`$node_master->stop('immediate');`
`138`	`138`
`139`	`139`	`$node_replica->promote;`
`140`		`-print"waiting for replica to come up\n";`
`141`		`-$node_replica->poll_query_until('postgres',`
`142`		`-"SELECT NOT pg_is_in_recovery();")`
`143`		`-ordie"replica never exited recovery";`
`144`	`140`
`145`	`141`	`$node_replica->safe_psql('postgres',`
`146`	`142`	`"INSERT INTO decoding(blah) VALUES ('after failover');");`

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,6 @@`
`109`	`109`	`is($psql_out,'8128',"Visible");`
`110`	`110`	`$node_master->stop;`
`111`	`111`	`$node_slave->promote;`
`112`		`-$node_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`113`		`-ordie"Timed out while waiting for promotion of standby";`
`114`	`112`
`115`	`113`	`$node_slave->psql(`
`116`	`114`	`'postgres',`
`@@ -162,8 +160,6 @@`
`162`	`160`	`is($psql_out,'-1',"Not visible");`
`163`	`161`	`$node_master->stop;`
`164`	`162`	`$node_slave->promote;`
`165`		`-$node_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`166`		`-ordie"Timed out while waiting for promotion of standby";`
`167`	`163`
`168`	`164`	`$node_slave->psql(`
`169`	`165`	`'postgres',`
`@@ -205,8 +201,6 @@`
`205`	`201`	`is($psql_out,'-1',"Not visible");`
`206`	`202`	`$node_master->stop;`
`207`	`203`	`$node_slave->promote;`
`208`		`-$node_slave->poll_query_until('postgres',"SELECT NOT pg_is_in_recovery()")`
`209`		`-ordie"Timed out while waiting for promotion of standby";`
`210`	`204`
`211`	`205`	`$node_slave->psql(`
`212`	`206`	`'postgres',`

Comments

(0)