Use Cluster.pm in test 001.

Author: kvap

t/001_basic_recovery.pl

@@ -1,71 +1,15 @@
 use strict;
 use warnings;
-use PostgresNode;
+use Cluster;
 use TestLib;
 use Test::More tests => 3;
 use DBI;
 use DBD::Pg ':async';
 
-###############################################################################
-# Aux routines
-###############################################################################
-
-sub PostgresNode::inet_connstr {
-   my ($self, $dbname) = @_;
-   my $pgport = $self->port;
-   my $pghost = '127.0.0.1';
-   my $pgdata = $self->data_dir;
-
-   if (!defined($dbname))
-   {
-   	return "port=$pgport host=$pghost";
-   }
-   return "port=$pgport host=$pghost dbname=$dbname";
-}
-
-###############################################################################
-# Setup nodes
-###############################################################################
-
-my $nnodes = 3;
-my @nodes = ();
-my $pgconf_common = qq(
-	listen_addresses = '127.0.0.1'
-	max_prepared_transactions = 200
-    max_connections = 200
-	max_worker_processes = 100
-	max_wal_senders = 10
-	max_replication_slots = 10
-	wal_level = logical
-    wal_sender_timeout = 0
-	shared_preload_libraries = 'raftable,multimaster'
-	multimaster.workers=10
-	multimaster.queue_size=10485760 # 10mb
-);
-
-# Init nodes
-for (my $i=0; $i < $nnodes; $i++) {
-   push(@nodes, get_new_node("node$i"));
-   $nodes[$i]->init;
-}
-
-# Collect conn info
-my $mm_connstr = join(', ', map { "${ \$_->inet_connstr('postgres') }" } @nodes);
-
-# Configure and start nodes
-for (my $i=0; $i < $nnodes; $i++) {
-   $nodes[$i]->append_conf('postgresql.conf', $pgconf_common);
-   $nodes[$i]->append_conf('postgresql.conf', qq(
-      #port = ${ \$nodes[$i]->port }
-      multimaster.node_id = @{[ $i + 1 ]}
-      multimaster.conn_strings = '$mm_connstr'
-      #multimaster.arbiter_port = ${ \$nodes[0]->port }
-   ));
-   $nodes[$i]->append_conf('pg_hba.conf', qq(
-   	host replication all 127.0.0.1/32 trust
-   ));
-   $nodes[$i]->start;
-}
+my $cluster = new Cluster(3);
+$cluster->init();
+$cluster->configure();
+$cluster->start();
 
 ###############################################################################
 # Wait until nodes are up
@@ -79,11 +23,11 @@ sub PostgresNode::inet_connstr {
 # Replication check
 ###############################################################################
 
-$nodes[0]->psql('postgres', "
+$cluster->psql(0, 'postgres', "
 	create extension multimaster;
 	create table if not exists t(k int primary key, v int);
 	insert into t values(1, 10);");
-$nodes[1]->psql('postgres', "select v from t where k=1;", stdout => \$psql_out);
+$cluster->psql(1, 'postgres', "select v from t where k=1;", stdout => \$psql_out);
 is($psql_out, '10', "Check replication while all nodes are up.");
 
 ###############################################################################
@@ -97,15 +41,15 @@ sub PostgresNode::inet_connstr {
 ###############################################################################
 
 diag("stopping node 2");
-$nodes[2]->teardown_node;
+$cluster->{nodes}->[2]->teardown_node;
 
 diag("sleeping 15");
 sleep(15);
 
 diag("inserting 2");
-$nodes[0]->psql('postgres', "insert into t values(2, 20);");
+$cluster->psql(0, 'postgres', "insert into t values(2, 20);");
 diag("selecting");
-$nodes[1]->psql('postgres', "select v from t where k=2;", stdout => \$psql_out);
+$cluster->psql(1, 'postgres', "select v from t where k=2;", stdout => \$psql_out);
 diag("selected");
 is($psql_out, '20', "Check replication after node failure.");
 
@@ -114,13 +58,13 @@ sub PostgresNode::inet_connstr {
 ###############################################################################
 
 diag("starting node 2");
-$nodes[2]->start;
+$cluster->{nodes}->[2]->start;
 diag("sleeping 30");
 sleep(30); # XXX: here we can poll
 diag("inserting 3");
-$nodes[0]->psql('postgres', "insert into t values(3, 30);");
+$cluster->psql(0, 'postgres', "insert into t values(3, 30);");
 diag("selecting");
-$nodes[2]->psql('postgres', "select v from t where k=3;", stdout => \$psql_out);
+$cluster->psql(2, 'postgres', "select v from t where k=3;", stdout => \$psql_out);
 diag("selected");
 is($psql_out, '30', "Check replication after failed node recovery.");