Use the Cluster perl module in 000_deadlock test.

kvap · kvap · commit 742c2b9cbddc · 2016-04-11T15:09:59.000+03:00
diff --git a/contrib/mmts/t/000_deadlock.pl b/contrib/mmts/t/000_deadlock.pl
@@ -1,7 +1,7 @@
 use strict;
 use warnings;
 
-use PostgresNode;
+use Cluster;
 use TestLib;
 use Test::More tests => 1;
 
@@ -34,98 +34,19 @@ sub query_exec_async
 	return $rv;
 }
 
-my %allocated_ports = ();
-sub allocate_ports
-{
-	my @allocated_now = ();
-	my ($host, $ports_to_alloc) = @_;
-
-	while ($ports_to_alloc > 0)
-	{
-		my $port = int(rand() * 16384) + 49152;
-		next if $allocated_ports{$port};
-		diag("Checking for port $port\n");
-		if (!TestLib::run_log(['pg_isready', '-h', $host, '-p', $port]))
-		{
-			$allocated_ports{$port} = 1;
-			push(@allocated_now, $port);
-			$ports_to_alloc--;
-		}
-	}
-
-	return @allocated_now;
-}
-
-my $nnodes = 2;
-my @nodes = ();
-
-# Create nodes and allocate ports
-foreach my $i (1..$nnodes)
-{
-	my $host = "127.0.0.1";
-	my ($pgport, $raftport) = allocate_ports($host, 2);
-	my $node = new PostgresNode("node$i", $host, $pgport);
-	$node->{id} = $i;
-	$node->{raftport} = $raftport;
-	push(@nodes, $node);
-}
+my $cluster = new Cluster(2);
 
-my $mm_connstr = join(',', map { "${ \$_->connstr('postgres') }" } @nodes);
-my $raft_peers = join(',', map { join(':', $_->{id}, $_->host, $_->{raftport}) } @nodes);
-
-diag("mm_connstr = $mm_connstr\n");
-diag("raft_peers = $raft_peers\n");
-
-# Init and Configure
-foreach my $node (@nodes)
-{
-	my $id = $node->{id};
-	my $host = $node->host;
-	my $pgport = $node->port;
-	my $raftport = $node->{raftport};
-
-	$node->init(hba_permit_replication => 0);
-	$node->append_conf("postgresql.conf", qq(
-		listen_addresses = '$host'
-		unix_socket_directories = ''
-		port = $pgport
-		max_prepared_transactions = 10
-		max_worker_processes = 10
-		wal_level = logical
-		fsync = off	
-		max_wal_senders = 10
-		wal_sender_timeout = 0
-		max_replication_slots = 10
-		shared_preload_libraries = 'raftable,multimaster'
-		multimaster.workers = 4
-		multimaster.queue_size = 10485760 # 10mb
-		multimaster.node_id = $id
-		multimaster.conn_strings = '$mm_connstr'
-		multimaster.use_raftable = true
-		raftable.id = $id
-		raftable.peers = '$raft_peers'
-	));
-
-	$node->append_conf("pg_hba.conf", qq(
-		local replication all trust
-		host replication all 127.0.0.1/32 trust
-		host replication all ::1/128 trust
-	));
-}
-
-# Start
-foreach my $node (@nodes)
-{
-	$node->start();
-}
+$cluster->init();
+$cluster->configure();
+$cluster->start();
 
 my ($rc, $out, $err);
 sleep(10);
 
-$nodes[0]->psql('postgres', "create table t(k int primary key, v text)");
-$nodes[0]->psql('postgres', "insert into t values (1, 'hello'), (2, 'world')");
+$cluster->psql(0, 'postgres', "create table t(k int primary key, v text)");
+$cluster->psql(0, 'postgres', "insert into t values (1, 'hello'), (2, 'world')");
 
-my @conns = map { DBI->connect('DBI:Pg:' . $_->connstr()) } @nodes;
+my @conns = map { DBI->connect('DBI:Pg:' . $_->connstr()) } @{$cluster->{nodes}};
 
 query_exec($conns[0], "begin");
 query_exec($conns[1], "begin");
