Add a check that the cluster stops gracefully, to the tap tests.

kvap · kelvich · commit aaa5ee8aaf57 · 2017-11-13T02:17:31.000+03:00
diff --git a/Cluster.pm b/Cluster.pm
@@ -126,15 +126,46 @@ sub start
 	}
 }
 
+sub stopnode
+{
+	my ($node, $mode) = @_;
+	my $port   = $node->port;
+	my $pgdata = $node->data_dir;
+	my $name   = $node->name;
+	$mode = 'fast' unless defined $mode;
+	diag("stopping node $name ${mode}ly at $pgdata port $port");
+	next unless defined $node->{_pid};
+	my $ret = TestLib::system_log('pg_ctl', '-D', $pgdata, '-m', 'fast', 'stop');
+	$node->{_pid} = undef;
+	$node->_update_pid;
+
+	if ($ret != 0) {
+		diag("$name failed to stop ${mode}ly");
+		return 0;
+	}
+
+	return 1;
+}
+
 sub stop
 {
-	my ($self) = @_;
+	my ($self, $mode) = @_;
 	my $nodes = $self->{nodes};
+	$mode = 'fast' unless defined $mode;
 
+	my $ok = 1;
+	diag("stopping cluster ${mode}ly");
 	foreach my $node (@$nodes)
 	{
-		$node->stop('fast');
+		if (!stopnode($node, $mode)) {
+			$ok = 0;
+			if (!stopnode($node, 'immediate')) {
+				BAIL_OUT("failed to stop $node immediately");
+			}
+		}
 	}
+
+	return $ok;
 }
 
 sub teardown
diff --git a/t/000_deadlock.pl b/t/000_deadlock.pl
@@ -3,7 +3,7 @@
 
 use Cluster;
 use TestLib;
-use Test::More tests => 1;
+use Test::More tests => 2;
 
 use DBI;
 use DBD::Pg ':async';
@@ -93,5 +93,5 @@ sub query_exec_async
 
 query_row($conns[0], "select * from t where k = 1");
 
-$cluster->stop();
+ok($cluster->stop(), "cluster stops");
 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 => 7;
+use Test::More tests => 8;
 
 my $cluster = new Cluster(3);
 $cluster->init();
@@ -108,5 +108,5 @@
 
 is($psql_out, '90', "Check replication after failed node recovery.");
 
-$cluster->stop();
+ok($cluster->stop(), "cluster stops");
 1;
diff --git a/t/002_cross.pl b/t/002_cross.pl
@@ -3,7 +3,7 @@
 
 use Cluster;
 use TestLib;
-use Test::More tests => 1;
+use Test::More tests => 2;
 use IPC::Run qw(start finish);
 use Cwd;
 
@@ -150,5 +150,5 @@ sub parse_state
 
 is($anomalies, 0, "no cross anomalies after $selects selects");
 
-$cluster->stop();
+ok($cluster->stop(), "cluster stops");
 1;
diff --git a/t/003_pgbench.pl b/t/003_pgbench.pl
@@ -3,7 +3,7 @@
 
 use Cluster;
 use TestLib;
-use Test::More tests => 2;
+use Test::More tests => 3;
 use IPC::Run qw(start finish);
 use Cwd;
 
@@ -110,5 +110,5 @@ sub writer
 ($rc, $out, $err) = $cluster->psql(0, 'postgres', "select count(*) from reader_log where v = 0;");
 isnt($out, 0, "there are some zeros in reader_log");
 
-$cluster->stop();
+ok($cluster->stop(), "cluster stops");
 1;
