fix arbiter socket after failed connect()

kelvich · kelvich · commit f3c0e4e6cacc · 2016-03-23T15:00:34.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -243,30 +243,34 @@ static int MtmConnectSocket(char const* host, int port, int max_attempts)
 	if (!MtmResolveHostByName(host, addrs, &n_addrs)) {
 		elog(ERROR, "Arbiter failed to resolve host '%s' by name", host);
 	}
-  Retry:
-	sd = socket(AF_INET, SOCK_STREAM, 0);
-	if (sd < 0) {
-	    elog(ERROR, "Arbiter failed to create socket: %d", errno);
-    }
+
+Retry:
+
     while (1) {
 		int rc = -1;
+
+		sd = socket(AF_INET, SOCK_STREAM, 0);
+		if (sd < 0) {
+			elog(ERROR, "Arbiter failed to create socket: %d", errno);
+		}
 		for (i = 0; i < n_addrs; ++i) {
 			memcpy(&sock_inet.sin_addr, &addrs[i], sizeof sock_inet.sin_addr);
 			do {
 				rc = connect(sd, (struct sockaddr*)&sock_inet, sizeof(sock_inet));
 			} while (rc < 0 && errno == EINTR);
-			
+
 			if (rc >= 0 || errno == EINPROGRESS) {
 				break;
 			}
 		}
 		if (rc < 0) {
 			if ((errno != ENOENT && errno != ECONNREFUSED && errno != EINPROGRESS) || max_attempts == 0) {
-				elog(WARNING, "Arbiter failed to connect to %s:%d: %d", host, port, errno);
+				elog(WARNING, "Arbiter failed to connect to %s:%d: error=%d", host, port, errno);
 				return -1;
 			} else { 
 				max_attempts -= 1;
-				MtmSleep(MtmConnectTimeout);
+				elog(WARNING, "Arbiter trying to connect to %s:%d: error=%d", host, port, errno);
+				MtmSleep(5*MtmConnectTimeout);
 			}
 			continue;
 		} else {
diff --git a/contrib/mmts/tests/pg_hba.conf b/contrib/mmts/tests/pg_hba.conf
@@ -90,4 +90,7 @@ host    all             all             ::1/128                 trust
 # replication privilege.
 local   replication     knizhnik                                trust
 host    replication     knizhnik        127.0.0.1/32            trust
+local replication stas trust
+host  replication stas ::1/128 trust
+host  replication stas 127.0.0.1/32 trust
 #host    replication     knizhnik        ::1/128                 trust
diff --git a/contrib/mmts/tests/postgresql.conf.mm b/contrib/mmts/tests/postgresql.conf.mm
@@ -625,4 +625,4 @@
 # Add settings for extensions here
 
 multimaster.workers=8
-multimaster.queue_size=1073741824
+multimaster.queue_size=104857600 # 100mb
diff --git a/contrib/mmts/tests/reinit-mm.sh b/contrib/mmts/tests/reinit-mm.sh
@@ -3,6 +3,12 @@ export PATH=~/code/postgres_cluster/install/bin/:$PATH
 ulimit -c unlimited
 pkill -9 postgres
 pkill -9 arbiter
+
+cd ~/code/postgres_cluster/contrib/mmts/
+make install
+cd ~/code/postgres_cluster/contrib/mmts/tests
+
+
 rm -fr node? *.log dtm
 mkdir dtm
 conn_str=""
@@ -28,9 +34,10 @@ do
     echo "multimaster.conn_strings = '$conn_str'" >> node$i/postgresql.conf
     echo "multimaster.node_id = $i" >> node$i/postgresql.conf
     cp pg_hba.conf node$i
-    pg_ctl -D node$i -l node$i.log start
+    pg_ctl -w -D node$i -l node$i.log start
 done
 
-sleep 5
+# sleep 5
+# psql -c "create extension multimaster;" postgres
 
 echo Done
