replace sleeps with awaiting in 004_recovery.pl

Author: kelvich

Cluster.pm

@@ -400,4 +400,14 @@ sub add_node()
 	push(@{$self->{nodes}}, $node);
 }
 
+sub await_nodes()
+{
+	my ($self, @nodenums) = @_;
+
+	foreach my $i (@nodenums)
+	{
+		$self->{nodes}->[$i]->poll_query_until('postgres', "select 't'");
+	}
+}
+
 1;

t/004_recovery.pl

@@ -2,14 +2,14 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 4;
+use Test::More tests => 6;
 
 
 my $cluster = new Cluster(3);
 $cluster->init();
 $cluster->configure();
 $cluster->start();
-sleep(10);
+$cluster->await_nodes( (0,1,2) );
 
 ########################################################
 # Check data integrity before and after recovery
@@ -29,7 +29,6 @@
     (select * from pgbench_accounts order by aid) t;";
 
 $cluster->{nodes}->[2]->stop('fast');
-sleep(3);
 
 $cluster->pgbench(0, ('-n','-N', -T => '4') );
 $cluster->pgbench(1, ('-n','-N', -T => '4') );
@@ -42,7 +41,7 @@
 $oldhash = $hash0;
 
 $cluster->{nodes}->[2]->start;
-sleep(10);
+$cluster->await_nodes( (2) );
 
 $cluster->psql(0, 'postgres', $hash_query, stdout => \$hash0);
 $cluster->psql(1, 'postgres', $hash_query, stdout => \$hash1);
@@ -61,19 +60,16 @@
 $cluster->psql(0, 'postgres', "insert into t values(1, 10);");
 $cluster->psql(1, 'postgres', "insert into t values(2, 20);");
 $cluster->psql(2, 'postgres', "insert into t values(3, 30);");
-sleep(2);
 
 my $sum0; my $sum1; my $sum2;
 
 $cluster->{nodes}->[1]->stop('fast');
 $cluster->{nodes}->[2]->stop('fast');
 
-sleep(5);
 $cluster->{nodes}->[1]->start;
-# try to start node3 right here?
-sleep(5);
 $cluster->{nodes}->[2]->start;
-sleep(5);
+
+$cluster->await_nodes( (0,1,2) );
 
 $cluster->psql(0, 'postgres', "select sum(v) from t;", stdout => \$sum0);
 $cluster->psql(1, 'postgres', "select sum(v) from t;", stdout => \$sum1);
@@ -90,19 +86,19 @@
 $cluster->pgbench(2, ('-N', -T => '1') );
 
 # kill node while neighbour is under load
-my $pgb_handle = $cluster->pgbench_async(1, ('-N', -T => '10') );
+my $pgb_handle = $cluster->pgbench_async(1, ('-N', -T => '20') );
 sleep(5);
 $cluster->{nodes}->[2]->stop('fast');
 $cluster->pgbench_await($pgb_handle);
 
 # start node while neighbour is under load
-$pgb_handle = $cluster->pgbench_async(0, ('-N', -T => '50') );
-sleep(10);
+$pgb_handle = $cluster->pgbench_async(0, ('-N', -T => '20') );
+sleep(5);
 $cluster->{nodes}->[2]->start;
 $cluster->pgbench_await($pgb_handle);
 
-# give it extra 10s to recover
-sleep(10);
+# await recovery
+$cluster->await_nodes( (2) );
 
 # check data identity
 $cluster->psql(0, 'postgres', $hash_query, stdout => \$hash0);
@@ -111,17 +107,13 @@
 note("$hash0, $hash1, $hash2");
 is( (($hash0 == $hash1) and ($hash1 == $hash2)) , 1, "Check that hash is the same");
 
-# $cluster->psql(0, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum0);
-# $cluster->psql(1, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum1);
-# $cluster->psql(2, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum2);
-
-# note("Sums: $sum0, $sum1, $sum2");
-# is($sum2, $sum0, "Check that sum_2 == sum_0");
-# is($sum2, $sum1, "Check that sum_2 == sum_1");
+$cluster->psql(0, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum0);
+$cluster->psql(1, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum1);
+$cluster->psql(2, 'postgres', "select sum(abalance) from pgbench_accounts;", stdout => \$sum2);
 
-if ($sum2 == '') {
-	sleep(3600);
-}
+note("Sums: $sum0, $sum1, $sum2");
+is($sum2, $sum0, "Check that sum_2 == sum_0");
+is($sum2, $sum1, "Check that sum_2 == sum_1");
 
 $cluster->{nodes}->[0]->stop('fast');
 $cluster->{nodes}->[1]->stop('fast');