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

Author: knizhnik

contrib/mmts/Cluster.pm

@@ -155,4 +155,22 @@ sub psql
 	return $node->psql(@args);
 }
 
+sub poll
+{
+	my ($self, $poller, $dbname, $pollee, $tries, $delay) = @_;
+	my $node = $self->{nodes}->[$poller];
+	for (my $i = 0; $i < $tries; $i++) {
+		my $psql_out;
+		my $pollee_plus_1 = $pollee + 1;
+		$self->psql($poller, $dbname, "select mtm.poll_node($pollee_plus_1, true);", stdout => \$psql_out);
+		if ($psql_out eq "t") {
+			return 1;
+		}
+		my $tries_left = $tries - $i - 1;
+		diag("$poller poll for $pollee failed [$tries_left tries left]");
+		sleep($delay);
+	}
+	return 0;
+}
+
 1;

contrib/mmts/docker/Dockerfile

@@ -1860,7 +1860,10 @@ static void MtmSplitConnStrs(void)
 	}
 	if (i > MAX_NODES) { 
 		elog(ERROR, "Multimaster with more than %d nodes is not currently supported", MAX_NODES);
-	}	
+	}
+	if (MtmNodeId > i) {
+		elog(ERROR, "Multimaster node id %d is out of range [%d..%d]", MtmNodeId, 1, i);
+	}
 	if (i < 2) { 
         elog(ERROR, "Multimaster should have at least two nodes");
 	}	
@@ -2262,7 +2265,8 @@ _PG_init(void)
 
     BgwPoolStart(MtmWorkers, MtmPoolConstructor);
 
-	MtmRaftableInitialize();
+	if (MtmUseRaftable)
+		MtmRaftableInitialize();
 	MtmArbiterInitialize();
 
 	/*

contrib/mmts/docker/docker-compose.yml

@@ -2,7 +2,7 @@
 use warnings;
 use Cluster;
 use TestLib;
-use Test::More tests => 4;
+use Test::More tests => 7;
 
 my $cluster = new Cluster(3);
 $cluster->init();
@@ -43,19 +43,19 @@
 
 sleep(5); # Wait until failure of node will be detected
 
-diag("inserting 2 on node 1");
+diag("inserting 2 on node 0");
 my $ret = $cluster->psql(0, 'postgres', "insert into t values(2, 20);"); # this transaciton may fail
 diag "tx1 status = $ret";
 
-diag("inserting 3 on node 2");
+diag("inserting 3 on node 1");
 my $ret = $cluster->psql(1, 'postgres', "insert into t values(3, 30);"); # this transaciton may fail
 diag "tx2 status = $ret";
 
-diag("inserting 4 on node 1 (can fail)");
+diag("inserting 4 on node 0 (can fail)");
 my $ret = $cluster->psql(0, 'postgres', "insert into t values(4, 40);"); 
 diag "tx1 status = $ret";
 
-diag("inserting 5 on node 2 (can fail)");
+diag("inserting 5 on node 1 (can fail)");
 my $ret = $cluster->psql(1, 'postgres', "insert into t values(5, 50);"); 
 diag "tx2 status = $ret";
 
@@ -73,28 +73,31 @@
 
 sleep(5); # Wait until node is started
 
-diag("inserting 6 on node 1 (can fail)");
+diag("inserting 6 on node 0 (can fail)");
 $cluster->psql(0, 'postgres', "insert into t values(6, 60);"); 
-diag("inserting 7 on node 2 (can fail)");
+diag("inserting 7 on node 1 (can fail)");
 $cluster->psql(1, 'postgres', "insert into t values(7, 70);");
 
-$cluster->psql(0, 'postgres', "select mtm.poll_node(3);");
-$cluster->psql(1, 'postgres', "select mtm.poll_node(3);");
-$cluster->psql(2, 'postgres', "select mtm.poll_node(3);");
+diag("polling node 2");
+for (my $poller = 0; $poller < 3; $poller++) {
+	my $pollee = 2;
+	ok($cluster->poll($poller, 'postgres', $pollee, 10, 1), "node $pollee is online according to node $poller");
+}
 
+diag("getting cluster state");
 $cluster->psql(0, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
 diag("Node 1 status: $psql_out");
 $cluster->psql(1, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
 diag("Node 2 status: $psql_out");
 $cluster->psql(2, 'postgres', "select * from mtm.get_cluster_state();", stdout => \$psql_out);
 diag("Node 3 status: $psql_out");
 
-diag("inserting 8 on node 1");
+diag("inserting 8 on node 0");
 $cluster->psql(0, 'postgres', "insert into t values(8, 80);");
-diag("inserting 9 on node 2");
+diag("inserting 9 on node 1");
 $cluster->psql(1, 'postgres', "insert into t values(9, 90);");
 
-diag("selecting from node 3");
+diag("selecting from node 2");
 $cluster->psql(2, 'postgres', "select v from t where k=8;", stdout => \$psql_out);
 diag("selected");
 

contrib/mmts/docker/docker-entrypoint.sh

@@ -15,7 +15,7 @@ if [ "$1" = 'postgres' ]; then
 
 	# look specifically for PG_VERSION, as it is expected in the DB dir
 	if [ ! -s "$PGDATA/PG_VERSION" ]; then
-		initdb
+		initdb --nosync
 
 		if [ "$POSTGRES_PASSWORD" ]; then
 			pass="PASSWORD '$POSTGRES_PASSWORD'"

contrib/mmts/multimaster.c

@@ -106,7 +106,8 @@ static int create_listening_socket(const char *host, int port)
 		optval = 1;
 		setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (char const*)&optval, sizeof(optval));
 		setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char const*)&optval, sizeof(optval));
-		
+		fcntl(s, F_SETFL, O_NONBLOCK);
+
 		elog(DEBUG1, "binding tcp %s:%d\n", host, port);
 		if (bind(s, a->ai_addr, a->ai_addrlen) < 0)
 		{