evict all sleep-based awaiting in tap tests

Author: kelvich

Cluster.pm

@@ -225,15 +225,8 @@ sub stop
 	note("stopping cluster ${mode}ly");
 
 	foreach my $node (@$nodes) {
-		if (!stopnode($node, $mode)) {
-			$ok = 0;
-			# if (!stopnode($node, 'kill')) {
-			# 	my $name = $node->name;
-			# 	BAIL_OUT("failed to kill $name");
-			# }
-		}
+		$node->stop($mode);
 	}
-	sleep(2);
 
 	$self->dumplogs();
 
@@ -313,6 +306,7 @@ sub pgbench_async()
 sub pgbench_await()
 {
 	my ($self, $pgbench_handle) = @_;
+	note("finished pgbench");
 	IPC::Run::finish($pgbench_handle) || BAIL_OUT("pgbench exited with $?");
 }
 
@@ -328,6 +322,7 @@ sub is_data_identic()
 	{
 		my $current_hash = '';
 		$self->{nodes}->[$i]->psql('postgres', $sql, stdout => \$current_hash);
+		note("hash$i: $current_hash");
 		if ($current_hash eq '')
 		{
 			note("got empty hash from node $i");

t/000_truncate.pl

@@ -13,49 +13,29 @@
 $cluster->init();
 $cluster->configure();
 $cluster->start();
-note("sleeping 10");
-sleep(10);
+$cluster->await_nodes( (0,1) );
 
-my ($in, $out, $err, $rc);
+my ($out, $err, $rc);
 my $seconds = 30;
-$in = '';
+my $total_err = '';
 $out = '';
 
-my @init_argv = (
-	'pgbench',
-	'-i',
-	-h => $cluster->{nodes}->[0]->host(),
-	-p => $cluster->{nodes}->[0]->port(),
-	'postgres',
-);
-note("running pgbench init");
-my $init_run = start(\@init_argv, $in, $out);
-finish($init_run) || BAIL_OUT("pgbench exited with $?");
-
-my @bench_argv = (
-	'pgbench',
-	"-T $seconds",
-	'-N',
-	'-c 8',
-	-h => $cluster->{nodes}->[0]->host(),
-	-p => $cluster->{nodes}->[0]->port(),
-	'postgres',
-);
-note("running pgbench: " . join(' ', @bench_argv));
-my $bench_run = start(\@bench_argv, $in, $out);
-sleep(2);
+$cluster->pgbench(0, ('-i', -s => '1') );
+my $pgb_handle = $cluster->pgbench_async(0, ('-N', '-n', -T => $seconds, -c => 8) );
 
 my $started = time();
 while (time() - $started < $seconds)
 {
 	($rc, $out, $err) = $cluster->psql(1, 'postgres', "truncate pgbench_history;");
-	($rc, $out, $err) = $cluster->psql(1, 'postgres', "vacuum full");
-	($rc, $out, $err) = $cluster->psql(0, 'postgres', "truncate pgbench_history;");
-	($rc, $out, $err) = $cluster->psql(0, 'postgres', "vacuum full");
-	sleep(0.5);
+	note("truncated");
+	$total_err .= $err;
+	sleep(1);
+	# ($rc, $out, $err) = $cluster->psql(0, 'postgres', "truncate pgbench_history;");
+	# $total_err .= $err;
+	# sleep(0.5);
 }
+$cluster->pgbench_await($pgb_handle);
 
-finish($bench_run) || $cluster->bail_out_with_logs("pgbench exited with $?");
-sleep(1);
-ok($cluster->stop('fast'), "cluster stops");
+is($total_err, '', "truncate successful");
+$cluster->stop();
 1;

t/001_basic_recovery.pl

@@ -2,21 +2,16 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 9;
+use Test::More tests => 5;
 
 my $cluster = new Cluster(3);
 $cluster->init();
 $cluster->configure();
 $cluster->start();
-
-###############################################################################
-# Wait until nodes are up
-###############################################################################
+$cluster->await_nodes( (0,1,2) );
 
 my $ret;
 my $psql_out;
-# XXX: create extension on start and poll_untill status is Online
-sleep(10);
 
 ###############################################################################
 # Replication check
@@ -47,12 +42,9 @@
 	$cluster->bail_out_with_logs("failed to stop $name in fast mode");
 }
 
-sleep(5); # Wait until failure of node will be detected
-
 note("inserting 2 on node 0");
 $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);"); # this transaciton may fail
 note("tx1 status = $ret");
- 
 
 note("inserting 3 on node 1");
 $ret = $cluster->psql(1, 'postgres', "insert into t values(3, 30);"); # this transaciton may fail
@@ -78,19 +70,13 @@
 note("starting node 2");
 $cluster->{nodes}->[2]->start;
 
-sleep(5); # Wait until node is started
+$cluster->await_nodes( (2) );
 
 note("inserting 6 on node 0 (can fail)");
 $cluster->psql(0, 'postgres', "insert into t values(6, 60);"); 
 note("inserting 7 on node 1 (can fail)");
 $cluster->psql(1, 'postgres', "insert into t values(7, 70);");
 
-note("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");
-}
-
 note("getting cluster state");
 $cluster->psql(0, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
 note("Node 1 status: $psql_out");
@@ -115,5 +101,5 @@
 
 is($psql_out, '90', "Check replication after failed node recovery.");
 
-ok($cluster->stop('fast'), "cluster stops");
+$cluster->stop();
 1;

t/002_cross.pl

@@ -18,8 +18,7 @@
 
 my ($rc, $in, $out, $err);
 
-note("sleeping 10");
-sleep(10);
+$cluster->await_nodes( (0,1) );
 
 note("preparing the tables");
 if ($cluster->psql(0, 'postgres', "create table t (k int primary key, v int)"))

t/003_pgbench.pl

@@ -16,8 +16,7 @@
 
 my ($rc, $in, $out, $err);
 
-note("sleeping 10");
-sleep(10);
+$cluster->await_nodes( (0,1) );
 
 note("preparing the tables");
 if ($cluster->psql(0, 'postgres', "create table t (k int primary key, v int)"))

t/004_recovery.pl

@@ -118,3 +118,5 @@
 $cluster->{nodes}->[0]->stop('fast');
 $cluster->{nodes}->[1]->stop('fast');
 $cluster->{nodes}->[2]->stop('fast');
+
+1;

t/005_add_stop_node.pl

@@ -111,3 +111,5 @@
 is($cluster->is_data_identic( (0,1,3,4) ), 1, "hard stop / resume");
 
 ok($cluster->stop('fast'), "cluster stops");
+
+1;