Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

knizhnik · knizhnik · commit d181bada4b49 · 2016-04-27T18:26:46.000+03:00
diff --git a/contrib/mmts/testeaux/RemoteCluster.pm b/contrib/mmts/testeaux/RemoteCluster.pm
@@ -5,32 +5,32 @@ use warnings;
 use Data::Dumper;
 use Net::OpenSSH;
 use Cwd;
+use RemoteNode;
 
 sub new
 {
 	my ($class, $config_fname) = @_;
 	open(my $config, '<', $config_fname);
-	my @config_lines = <$config>;
 	my @nodes = ();
 
 	# Parse connection options from ssh_config
-	my $node;
-	foreach (@config_lines)
+	my $node_cfg;
+	foreach (<$config>)
 	{
    		if (/^Host (.+)/)
 		{
-			if ($node->{'host'}){
-				push(@nodes, $node);
-				$node = {};
+			if ($node_cfg->{'host'}){
+				push(@nodes, new RemoteNode($node_cfg->{'host'}, $node_cfg->{'cfg'}));
+				$node_cfg = {};
 			}
-			$node->{'host'} = $1;
+			$node_cfg->{'host'} = $1;
 		}
 		elsif (/\s*([^\s]+)\s*([^\s]+)\s*/)
 		{
-			$node->{'cfg'}->{$1} = $2;
+			$node_cfg->{'cfg'}->{$1} = $2;
 		}
 	}
-	push(@nodes, $node);
+	push(@nodes, new RemoteNode($node_cfg->{'host'}, $node_cfg->{'cfg'}));
 
 	# print Dumper(@nodes);
 
@@ -43,49 +43,14 @@ sub new
 	return $self;
 }
 
-sub run
-{
-	my ($self, $node_id, $cmd) = @_;
-	my $node = $self->{nodes}[$node_id];
-	my $opts = $node->{cfg};
-
-	print "===\n";
-	print Dumper($opts);
-	print "===\n";
-
-	my $ssh = Net::OpenSSH->new(
-		$opts->{HostName},
-		port => $opts->{Port},
-		user => $opts->{User},
-		key_path => $opts->{IdentityFile} =~ /"([^"]*)"/,
-		master_opts => [-o => "StrictHostKeyChecking=no"]
-	);
-
-	my @ls = $ssh->capture($cmd);
-
-	print Dumper(@ls);
-
-}
-
 sub init
 {
 	my ($self) = @_;
 	my $nodes = $self->{nodes};
 
 	foreach my $node (@$nodes)
 	{
-		$node->init(hba_permit_replication => 0);
-	}
-}
-
-sub detach 
-{
-	my ($self) = @_;
-	my $nodes = $self->{nodes};
-
-	foreach my $node (@$nodes)
-	{
-		delete $node->{_pid};
+		$node->init;
 	}
 }
 
@@ -94,20 +59,19 @@ sub configure
 	my ($self) = @_;
 	my $nodes = $self->{nodes};
 
-	my $connstr = join(',', map { "${ \$_->connstr('postgres') }" } @$nodes);
-	my $raftpeers = join(',', map { join(':', $_->{id}, $_->host, $_->{raftport}) } @$nodes);
+	my $connstr = join(', ', map { $_->connstr('postgres') } @$nodes);
+	my $raftpeers = join(',', map { join(':', $_->{_id}, $_->{_host}, 6666) } @$nodes);
 
 	foreach my $node (@$nodes)
 	{
-		my $id = $node->{id};
-		my $host = $node->host;
-		my $pgport = $node->port;
-		my $raftport = $node->{raftport};
+		my $id = $node->{_id};
+		my $host = $node->{_host};
+		my $pgport = $node->{_port};
+		#my $raftport = $node->{raftport};
 
 		$node->append_conf("postgresql.conf", qq(
 			listen_addresses = '$host'
-			unix_socket_directories = ''
-			port = $pgport
+			port = 5432
 			max_prepared_transactions = 200
 			max_connections = 200
 			max_worker_processes = 100
@@ -130,8 +94,8 @@ sub configure
 
 		$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
+			host replication all 0.0.0.0/0 trust
+			host replication all ::1/0 trust
 		));
 	}
 }
@@ -165,15 +129,10 @@ sub psql
 	return $node->psql(@args);
 }
 
-
+# XXX: test
 my $cluster = new RemoteCluster('ssh-config');
-
-print $cluster->{'nnodes'} . "\n";
-
-$cluster->run(1, 'ls -la');
+$cluster->init;
+$cluster->configure;
+$cluster->start;
 
 1;
-
-
-
-
diff --git a/contrib/mmts/testeaux/RemoteNode.pm b/contrib/mmts/testeaux/RemoteNode.pm
@@ -7,8 +7,13 @@ use Net::OpenSSH;
 sub new
 {
 	my ($class, $name, $sshopts) = @_;
+	my ($node_id) = $name =~ /(\d+)/;
+
+	print "### Creating node $name.\n";
 
 	my $self = {
+		_name    => $name,
+		_id      => $node_id + 1,
 		_port    => $sshopts->{Port},
 		_host    => $sshopts->{HostName},
 		_user    => $sshopts->{User},
@@ -26,6 +31,13 @@ sub new
 	return $self;
 }
 
+sub connstr
+{
+	my ($self, $dbname) = @_;
+
+	"host=$self->{_host} dbname=$dbname";
+}
+
 sub execute
 {
 	my ($self, $cmd) = @_;
@@ -62,8 +74,8 @@ sub init
 	$self->execute("rm -rf $pgdata");
 	$self->execute("env LANG=C LC_ALL=C $pgbin/initdb -D $pgdata -A trust -N");
 	
-	$self->execute("echo 'fsync = off' >> $pgdata/postgresql.conf");
-	$self->execute("echo 'host all all 0.0.0.0/0 trust' >> $pgdata/pg_hba.conf");
+	$self->append_conf("postgresql.conf", "fsync = off");
+	$self->append_conf("pg_hba.conf", "host all all 0.0.0.0/0 trust");
 }
 
 sub start
@@ -72,7 +84,7 @@ sub start
 	my $pgbin = $self->{_pgbin}; 
 	my $pgdata = $self->{_pgdata};
 
-	$self->execute("$pgbin/pg_ctl -w -D $pgdata -l $pgdata/log start");
+	$self->execute("ulimit -c unlimited && $pgbin/pg_ctl -w -D $pgdata -l $pgdata/log start");
 }
 
 sub stop
@@ -90,34 +102,16 @@ sub restart
 	my $pgbin = $self->{_pgbin}; 
 	my $pgdata = $self->{_pgdata};
 
-	$self->execute("$pgbin/pg_ctl -w -D $pgdata restart");
+	$self->execute("$pgbin/pg_ctl -w -D $pgdata  -l $pgdata/log restart");
 }
 
 sub append_conf
 {
+	my ($self, $fname, $conf_str) = @_;
+	my $pgdata = $self->{_pgdata};
+	my $cmd = "cat <<- EOF >> $pgdata/$fname \n $conf_str \nEOF\n";
 
+	$self->execute($cmd);
 }
 
-sub psql
-{
-
-}
-
-# XXX: test
-my $node = new RemoteNode('node0', {
-          'Port' => '2200',
-          'IdentityFile' => '"/Users/stas/code/postgres_cluster/contrib/mmts/testeaux/.vagrant/machines/node1/virtualbox/private_key"',
-          'IdentitiesOnly' => 'yes',
-          'LogLevel' => 'FATAL',
-          'PasswordAuthentication' => 'no',
-          'StrictHostKeyChecking' => 'no',
-          'HostName' => '127.0.0.1',
-          'User' => 'vagrant',
-          'UserKnownHostsFile' => '/dev/null'
-        });
-
-$node->execute("ls -ls");
-$node->init;
-$node->start;
-
-
+1;
diff --git a/contrib/mmts/testeaux/Vagrantfile b/contrib/mmts/testeaux/Vagrantfile
@@ -3,11 +3,13 @@
 
 Vagrant.configure(2) do |config|
   config.vm.box = "ubuntu/trusty64"
+  config.vm.network "private_network", type: "dhcp"
 
   nhosts = 3
 
   nhosts.times do |i|
     config.vm.define "node#{i}" do |node|
+      #node.vm.network "private_network", ip: "10.20.30.#{i+40}"
       node.vm.hostname = "node#{i}"
       if i == nhosts - 1
         node.vm.provision :ansible do |ansible|
