tap tests clean-up: don't use immediate stop, logs on bail_out, clean syntax warnings

Author: kelvich

Cluster.pm

@@ -164,11 +164,10 @@ sub stopid
 	return stopnode($self->{nodes}->[$idx]);
 }
 
-sub stop
+sub dumplogs
 {
-	my ($self, $mode) = @_;
+	my ($self) = @_;
 	my $nodes = $self->{nodes};
-	$mode = 'fast' unless defined $mode;
 
 	diag("Dumping logs:");
 	foreach my $node (@$nodes) {
@@ -181,6 +180,15 @@ sub stop
 		diag($data);
 		diag("##################################################################\n\n");
 	}
+}
+
+sub stop
+{
+	my ($self, $mode) = @_;
+	my $nodes = $self->{nodes};
+	$mode = 'fast' unless defined $mode;
+
+	# $self->dumplogs();
 
 	my $ok = 1;
 	diag("stopping cluster ${mode}ly");
@@ -198,6 +206,13 @@ sub stop
 	return $ok;
 }
 
+sub bail_out_with_logs
+{
+	my ($self, $msg) = @_;
+	$self->dumplogs();
+	BAIL_OUT($msg);
+}
+
 sub teardown
 {
 	my ($self) = @_;

t/001_basic_recovery.pl

@@ -13,6 +13,7 @@
 # Wait until nodes are up
 ###############################################################################
 
+my $ret;
 my $psql_out;
 # XXX: create extension on start and poll_untill status is Online
 sleep(10);
@@ -39,32 +40,29 @@
 ###############################################################################
 
 diag("stopping node 2");
-if ($cluster->stopid(2, 'immediate')) {
-	pass("node 2 stops");
+if ($cluster->stopid(2, 'fast')) {
+	pass("node 2 stops in fast mode");
 } else {
-	fail("node 2 stops");
-	if (!$cluster->stopid(2, 'kill')) {
-		my $name = $cluster->{nodes}->[2]->name;
-		BAIL_OUT("failed to kill $name");
-	}
+	my $name = $cluster->{nodes}->[2]->name;
+	$cluster->bail_out_with_logs("failed to stop $name in fast mode");
 }
 
 sleep(5); # Wait until failure of node will be detected
 
 diag("inserting 2 on node 0");
-my $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);"); # this transaciton may fail
+$ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);"); # this transaciton may fail
 diag "tx1 status = $ret";
 
 diag("inserting 3 on node 1");
-my $ret = $cluster->psql(1, 'postgres', "insert into t values(3, 30);"); # this transaciton may fail
+$ret = $cluster->psql(1, 'postgres', "insert into t values(3, 30);"); # this transaciton may fail
 diag "tx2 status = $ret";
 
 diag("inserting 4 on node 0 (can fail)");
-my $ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);"); 
+$ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);"); 
 diag "tx1 status = $ret";
 
 diag("inserting 5 on node 1 (can fail)");
-my $ret = $cluster->psql(1, 'postgres', "insert into t values(5, 50);"); 
+$ret = $cluster->psql(1, 'postgres', "insert into t values(5, 50);"); 
 diag "tx2 status = $ret";
 
 diag("selecting");

t/002_cross.pl

@@ -24,12 +24,12 @@
 diag("preparing the tables");
 if ($cluster->psql(0, 'postgres', "create table t (k int primary key, v int)"))
 {
-	BAIL_OUT('failed to create t');
+	$cluster->bail_out_with_logs('failed to create t');
 }
 
 if ($cluster->psql(0, 'postgres', "insert into t (select generate_series(0, $nkeys - 1), 0)"))
 {
-	BAIL_OUT('failed to fill t');
+	$cluster->bail_out_with_logs('failed to fill t');
 }
 
 sub appender
@@ -145,7 +145,11 @@ sub parse_state
 diag("finishing benches");
 foreach my $appender (@appenders)
 {
-	finish($appender) || BAIL_OUT("pgbench exited with $?");
+	if (!finish($appender))
+	{
+		$cluster->dumplogs();
+		$cluster->bail_out_with_logs("pgbench exited with $?");
+	}
 }
 
 is($anomalies, 0, "no cross anomalies after $selects selects");

t/003_pgbench.pl

@@ -22,17 +22,17 @@
 diag("preparing the tables");
 if ($cluster->psql(0, 'postgres', "create table t (k int primary key, v int)"))
 {
-	BAIL_OUT('failed to create t');
+	$cluster->bail_out_with_logs('failed to create t');
 }
 
 if ($cluster->psql(0, 'postgres', "insert into t (select generate_series(0, 999), 0)"))
 {
-	BAIL_OUT('failed to fill t');
+	$cluster->bail_out_with_logs('failed to fill t');
 }
 
 if ($cluster->psql(0, 'postgres', "create table reader_log (v int)"))
 {
-	BAIL_OUT('failed to create reader_log');
+	$cluster->bail_out_with_logs('failed to create reader_log');
 }
 
 sub reader
@@ -98,7 +98,7 @@ sub writer
 diag("finishing benches");
 foreach my $bench (@benches)
 {
-	finish($bench) || BAIL_OUT("pgbench exited with $?");
+	finish($bench) || $cluster->bail_out_with_logs("pgbench exited with $?");
 }
 diag($out);