Make polls in tap-test 001 time out eventually.

kvap · kelvich · commit ce044b419bd3 · 2017-11-13T02:17:30.000+03:00
diff --git a/Cluster.pm b/Cluster.pm
@@ -155,4 +155,22 @@ sub psql
 	return $node->psql(@args);
 }
 
+sub poll
+{
+	my ($self, $poller, $dbname, $pollee, $tries, $delay) = @_;
+	my $node = $self->{nodes}->[$poller];
+	for (my $i = 0; $i < $tries; $i++) {
+		my $psql_out;
+		my $pollee_plus_1 = $pollee + 1;
+		$self->psql($poller, $dbname, "select mtm.poll_node($pollee_plus_1, true);", stdout => \$psql_out);
+		if ($psql_out eq "t") {
+			return 1;
+		}
+		my $tries_left = $tries - $i - 1;
+		diag("$poller poll for $pollee failed [$tries_left tries left]");
+		sleep($delay);
+	}
+	return 0;
+}
+
 1;
diff --git a/t/001_basic_recovery.pl b/t/001_basic_recovery.pl
@@ -2,7 +2,7 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 4;
+use Test::More tests => 7;
 
 my $cluster = new Cluster(3);
 $cluster->init();
@@ -78,10 +78,11 @@
 diag("inserting 7 on node 2 (can fail)");
 $cluster->psql(1, 'postgres', "insert into t values(7, 70);");
 
-diag("polling node");
-$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
-$cluster->psql(1, 'postgres', "select mtm.poll_node(3);");
-$cluster->psql(2, 'postgres', "select mtm.poll_node(3);");
+diag("polling node 2");
+for (my $poller = 0; $poller < 3; $poller++) {
+	my $pollee = 2;
+	ok($cluster->poll($poller, 'postgres', $pollee, 10, 1), "node $pollee is online according to node $poller");
+}
 
 diag("getting cluster state");
 $cluster->psql(0, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
