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

knizhnik · knizhnik · commit 91c57fa79248 · 2016-06-21T19:01:32.000+03:00
diff --git a/contrib/mmts/Cluster.pm b/contrib/mmts/Cluster.pm
@@ -132,7 +132,18 @@ sub stop
 
 	foreach my $node (@$nodes)
 	{
-		$node->stop();
+		$node->stop('fast');
+	}
+}
+
+sub teardown
+{
+	my ($self) = @_;
+	my $nodes = $self->{nodes};
+
+	foreach my $node (@$nodes)
+	{
+		$node->teardown();
 	}
 }
 
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include <netdb.h>
 #include <time.h>
+#include <fcntl.h>
 
 #include "postgres.h"
 #include "fmgr.h"
@@ -381,10 +382,11 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
     while (1) {
 		int rc = -1;
 
-		sd = socket(AF_INET, SOCK_STREAM|SOCK_NONBLOCK, 0);
+		sd = socket(AF_INET, SOCK_STREAM, 0);
 		if (sd < 0) {
 			elog(ERROR, "Arbiter failed to create socket: %d", errno);
 		}
+		fcntl(sd, F_SETFL, O_NONBLOCK);
 		busy_socket = sd;
 		for (i = 0; i < n_addrs; ++i) {
 			memcpy(&sock_inet.sin_addr, &addrs[i], sizeof sock_inet.sin_addr);
diff --git a/contrib/mmts/t/000_deadlock.pl b/contrib/mmts/t/000_deadlock.pl
@@ -92,3 +92,6 @@ sub query_exec_async
 }
 
 query_row($conns[0], "select * from t where k = 1");
+
+$cluster->stop();
+1;
diff --git a/contrib/mmts/t/001_basic_recovery.pl b/contrib/mmts/t/001_basic_recovery.pl
@@ -80,4 +80,5 @@
 
 is($psql_out, '40', "Check replication after failed node recovery.");
 
-
+$cluster->stop();
+1;
diff --git a/contrib/mmts/t/002_cross.pl b/contrib/mmts/t/002_cross.pl
@@ -149,3 +149,6 @@ sub parse_state
 }
 
 is($anomalies, 0, "no cross anomalies after $selects selects");
+
+$cluster->stop();
+1;
diff --git a/contrib/mmts/t/003_pgbench.pl b/contrib/mmts/t/003_pgbench.pl
@@ -109,3 +109,6 @@ 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");
+
+$cluster->stop();
+1;
diff --git a/contrib/mmts/tests/writer.pgb b/contrib/mmts/tests/writer.pgb
@@ -1,6 +1,6 @@
-\setrandom src 0 999
-\setrandom dst 0 999
-\setrandom amount 1 10
+\set src random(0, 999)
+\set dst random(0, 999)
+\set amount random(1, 10)
 begin;
 update t set v = v - :amount where k=:src;
 update t set v = v + :amount where k=:dst;
diff --git a/contrib/raftable/raftable.c b/contrib/raftable/raftable.c
@@ -28,6 +28,7 @@
 #include <arpa/inet.h>
 
 #include <unistd.h>
+#include <fcntl.h>
 #include <time.h>
 
 void _PG_init(void);
@@ -194,12 +195,13 @@ static bool connect_leader(timeout_t *timeout)
 	{
 		int one = 1;
 
-		sd = socket(a->ai_family, SOCK_STREAM | SOCK_NONBLOCK, 0);
+		sd = socket(a->ai_family, SOCK_STREAM, 0);
 		if (sd == -1)
 		{
 			elog(WARNING, "failed to create a socket: %s", strerror(errno));
 			continue;
 		}
+		fcntl(sd, F_SETFL, O_NONBLOCK);
 		setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));
 
 		if (connect(sd, a->ai_addr, a->ai_addrlen) == -1)

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,18 @@ sub stop`
`132`	`132`
`133`	`133`	`foreach my $node (@$nodes)`
`134`	`134`	`{`
`135`		`- $node->stop();`
	`135`	`+ $node->stop('fast');`
	`136`	`+ }`
	`137`	`+}`
	`138`	`+`
	`139`	`+sub teardown`
	`140`	`+{`
	`141`	`+ my ($self) = @_;`
	`142`	`+ my $nodes = $self->{nodes};`
	`143`	`+`
	`144`	`+ foreach my $node (@$nodes)`
	`145`	`+ {`
	`146`	`+ $node->teardown();`
`136`	`147`	`}`
`137`	`148`	`}`
`138`	`149`
Original file line number	Diff line number	Diff line change
`@@ -92,3 +92,6 @@ sub query_exec_async`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`query_row($conns[0], "select * from t where k = 1");`
	`95`	`+`
	`96`	`+$cluster->stop();`
	`97`	`+1;`
Original file line number	Diff line number	Diff line change
`@@ -149,3 +149,6 @@ sub parse_state`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`is($anomalies, 0, "no cross anomalies after $selects selects");`
	`152`	`+`
	`153`	`+$cluster->stop();`
	`154`	`+1;`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`#include <arpa/inet.h>`
`29`	`29`
`30`	`30`	`#include <unistd.h>`
	`31`	`+#include <fcntl.h>`
`31`	`32`	`#include <time.h>`
`32`	`33`
`33`	`34`	`void _PG_init(void);`
`@@ -194,12 +195,13 @@ static bool connect_leader(timeout_t *timeout)`
`194`	`195`	`{`
`195`	`196`	`int one = 1;`
`196`	`197`
`197`		`- sd = socket(a->ai_family, SOCK_STREAM \| SOCK_NONBLOCK, 0);`
	`198`	`+ sd = socket(a->ai_family, SOCK_STREAM, 0);`
`198`	`199`	`if (sd == -1)`
`199`	`200`	`{`
`200`	`201`	`elog(WARNING, "failed to create a socket: %s", strerror(errno));`
`201`	`202`	`continue;`
`202`	`203`	`}`
	`204`	`+ fcntl(sd, F_SETFL, O_NONBLOCK);`
`203`	`205`	`setsockopt(sd, IPPROTO_TCP, TCP_NODELAY, &one, sizeof(one));`
`204`	`206`
`205`	`207`	`if (connect(sd, a->ai_addr, a->ai_addrlen) == -1)`