Kill nodes after they fail to stop gracefully.

kvap · kvap · commit cf4f4689209b · 2016-08-16T16:19:47.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -130,18 +130,18 @@ sub start
 sub stopnode
 {
 	my ($node, $mode) = @_;
-	my $port   = $node->port;
-	my $pgdata = $node->data_dir;
-	my $name   = $node->name;
+	return 1 unless defined $node->{_pid};
 	$mode = 'fast' unless defined $mode;
-	diag("stopping node $name ${mode}ly at $pgdata port $port");
-	next unless defined $node->{_pid};
-	my $ret = 0;
+	my $name   = $node->name;
+	diag("stopping $name ${mode}ly");
+
 	if ($mode eq 'kill') {
 		killtree($node->{_pid});
-	} else {
-		$ret = TestLib::system_log('pg_ctl', '-D', $pgdata, '-m', 'fast', 'stop');
+		return 1;
 	}
+
+	my $pgdata = $node->data_dir;
+	my $ret = TestLib::system_log('pg_ctl', '-D', $pgdata, '-m', 'fast', 'stop');
 	$node->{_pid} = undef;
 	$node->_update_pid;
 
@@ -204,9 +204,9 @@ sub stop
 	foreach my $node (@$nodes) {
 		if (!stopnode($node, $mode)) {
 			$ok = 0;
-			if (!stopnode($node, 'immediate')) {
+			if (!stopnode($node, 'kill')) {
 				my $name = $node->name;
-				BAIL_OUT("failed to stop $name immediately");
+				BAIL_OUT("failed to kill $name");
 			}
 		}
 	}
diff --git a/contrib/mmts/t/000_deadlock.pl b/contrib/mmts/t/000_deadlock.pl
@@ -93,5 +93,5 @@ sub query_exec_async
 
 query_row($conns[0], "select * from t where k = 1");
 
-ok($cluster->stop('kill'), "cluster stops");
+ok($cluster->stop('fast'), "cluster stops");
 1;
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -108,5 +108,5 @@
 
 is($psql_out, '90', "Check replication after failed node recovery.");
 
-ok($cluster->stop('kill'), "cluster stops");
+ok($cluster->stop('fast'), "cluster stops");
 1;
diff --git a/contrib/mmts/t/002_cross.pl b/contrib/mmts/t/002_cross.pl
@@ -150,5 +150,5 @@ sub parse_state
 
 is($anomalies, 0, "no cross anomalies after $selects selects");
 
-ok($cluster->stop('kill'), "cluster stops");
+ok($cluster->stop('fast'), "cluster stops");
 1;
diff --git a/contrib/mmts/t/003_pgbench.pl b/contrib/mmts/t/003_pgbench.pl
@@ -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");
 
-ok($cluster->stop('kill'), "cluster stops");
+ok($cluster->stop('fast'), "cluster stops");
 1;
