Commitce044b4

authored and

committed

Make polls in tap-test 001 time out eventually.

1 parentf11c34e commitce044b4Copy full SHA for ce044b4

File tree

+24

-5

lines changed

+24

-5

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,4 +155,22 @@ sub psql`
`155`	`155`	`return$node->psql(@args);`
`156`	`156`	`}`
`157`	`157`
	`158`	`+subpoll`
	`159`	`+{`
	`160`	`+my ($self,$poller,$dbname,$pollee,$tries,$delay) =@_;`
	`161`	`+my$node =$self->{nodes}->[$poller];`
	`162`	`+for (my$i = 0;$i <$tries;$i++) {`
	`163`	`+my$psql_out;`
	`164`	`+my$pollee_plus_1 =$pollee + 1;`
	`165`	`+$self->psql($poller,$dbname,"select mtm.poll_node($pollee_plus_1, true);",stdout=> \$psql_out);`
	`166`	`+if ($psql_outeq"t") {`
	`167`	`+return 1;`
	`168`	`+}`
	`169`	`+my$tries_left =$tries -$i - 1;`
	`170`	`+diag("$poller poll for$pollee failed [$tries_left tries left]");`
	`171`	`+sleep($delay);`
	`172`	`+}`
	`173`	`+return 0;`
	`174`	`+}`
	`175`	`+`
`158`	`176`	`1;`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`use warnings;`
`3`	`3`	`use Cluster;`
`4`	`4`	`use TestLib;`
`5`		`-use Test::Moretests=>4;`
	`5`	`+use Test::Moretests=>7;`
`6`	`6`
`7`	`7`	`my$cluster = new Cluster(3);`
`8`	`8`	`$cluster->init();`
`@@ -78,10 +78,11 @@`
`78`	`78`	`diag("inserting 7 on node 2 (can fail)");`
`79`	`79`	`$cluster->psql(1,'postgres',"insert into t values(7, 70);");`
`80`	`80`
`81`		`-diag("polling node");`
`82`		`-$cluster->psql(0,'postgres',"select mtm.poll_node(3);");`
`83`		`-$cluster->psql(1,'postgres',"select mtm.poll_node(3);");`
`84`		`-$cluster->psql(2,'postgres',"select mtm.poll_node(3);");`
	`81`	`+diag("polling node 2");`
	`82`	`+for (my$poller = 0;$poller < 3;$poller++) {`
	`83`	`+my$pollee = 2;`
	`84`	`+ok($cluster->poll($poller,'postgres',$pollee, 10, 1),"node$pollee is online according to node$poller");`
	`85`	`+}`
`85`	`86`
`86`	`87`	`diag("getting cluster state");`
`87`	`88`	`$cluster->psql(0,'postgres',"select * from mtm.get_cluster_state();",stdout=> \$psql_out);`

Comments

(0)