fix arbiter port assignment logic

kelvich · kelvich · commit 0eef67b647a2 · 2016-10-24T17:56:09.000+03:00
diff --git a/contrib/mmts/arbiter.c b/contrib/mmts/arbiter.c
@@ -507,11 +507,7 @@ static void MtmOpenConnections()
 	}
 	for (i = 0; i < nNodes; i++) {
 		if (i+1 != MtmNodeId && i < Mtm->nAllNodes) { 
-			int arbiterPort = Mtm->nodes[i].con.arbiterPort;
-			if (arbiterPort == 0) {
-				arbiterPort = MtmArbiterPort + i + 1;
-			}
-			sockets[i] = MtmConnectSocket(i, arbiterPort, MtmConnectTimeout);
+			sockets[i] = MtmConnectSocket(i, Mtm->nodes[i].con.arbiterPort, MtmConnectTimeout);
 			if (sockets[i] < 0) { 
 				MtmOnNodeDisconnect(i+1);
 			} 
@@ -542,13 +538,13 @@ static bool MtmSendToNode(int node, void const* buf, int size)
 			BIT_CLEAR(Mtm->reconnectMask, node);
 			MtmUnlock();
 		}
-		if (sockets[node] < 0 || !MtmWriteSocket(sockets[node], buf, size)) { 
+		if (sockets[node] < 0 || !MtmWriteSocket(sockets[node], buf, size)) {
 			if (sockets[node] >= 0) { 
 				elog(WARNING, "Arbiter fail to write to node %d: %d", node+1, errno);
 				close(sockets[node]);
 				sockets[node] = -1;
 			}
-			sockets[node] = MtmConnectSocket(node, MtmArbiterPort + node + 1, MtmReconnectTimeout);
+			sockets[node] = MtmConnectSocket(node, Mtm->nodes[node].con.arbiterPort, MtmReconnectTimeout);
 			if (sockets[node] < 0) { 
 				MtmOnNodeDisconnect(node+1);
 				result = false;
@@ -638,7 +634,7 @@ static void MtmAcceptIncomingConnections()
 	}
 	sock_inet.sin_family = AF_INET;
 	sock_inet.sin_addr.s_addr = htonl(INADDR_ANY);
-	sock_inet.sin_port = htons(MtmArbiterPort + MtmNodeId);
+	sock_inet.sin_port = htons(MtmArbiterPort);
 
     gateway = socket(sock_inet.sin_family, SOCK_STREAM, 0);
 	if (gateway < 0) {
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -2157,8 +2157,10 @@ void MtmUpdateNodeConnectionInfo(MtmConnectionInfo* conn, char const* connStr)
 			elog(ERROR, "Invalid arbiter port: %s", port+12);
 		}
 	} else { 
-		conn->arbiterPort = 0;
+		conn->arbiterPort = MULTIMASTER_DEFAULT_ARBITER_PORT;
 	}
+
+	elog(WARNING, "Using arbiter port: %d", conn->arbiterPort);
 }
 
 static void MtmSplitConnStrs(void)
@@ -2643,7 +2645,7 @@ _PG_init(void)
 		"Base value for assigning arbiter ports",
 		NULL,
 		&MtmArbiterPort,
-		54320,
+		MULTIMASTER_DEFAULT_ARBITER_PORT,
 	    0,
 		INT_MAX,
 		PGC_BACKEND,
diff --git a/contrib/mmts/multimaster.h b/contrib/mmts/multimaster.h
@@ -58,6 +58,8 @@
 #define MULTIMASTER_BROADCAST_SERVICE   "mtm_broadcast"
 #define MULTIMASTER_ADMIN               "mtm_admin"
 
+#define MULTIMASTER_DEFAULT_ARBITER_PORT 5433
+
 #define MB (1024*1024L)
 
 #define USEC_TO_MSEC(t) ((t)/1000)
diff --git a/contrib/mmts/tests2/docker-compose.yml b/contrib/mmts/tests2/docker-compose.yml
@@ -10,7 +10,7 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 1
-      CONNSTR: |
+      CONNSTRS: >-
         dbname=regression user=pg host=node1 arbiterport=5433,
         dbname=regression user=pg host=toxi port=12000 arbiterport=12001,
         dbname=regression user=pg host=toxi port=13000 arbiterport=13001
@@ -25,7 +25,7 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 2
-      CONNSTR: |
+      CONNSTRS: >-
         dbname=regression user=pg host=toxi port=21000 arbiterport=21001,
         dbname=regression user=pg host=node2 arbiterport=5433,
         dbname=regression user=pg host=toxi port=23000 arbiterport=23001
@@ -40,7 +40,7 @@ services:
       POSTGRES_USER: 'pg'
       POSTGRES_DB: 'regression'
       NODE_ID: 3
-      CONNSTR: |
+      CONNSTRS: >-
         dbname=regression user=pg host=toxi port=31000 arbiterport=31001,
         dbname=regression user=pg host=toxi port=32000 arbiterport=32001,
         dbname=regression user=pg host=node3 arbiterport=5433
diff --git a/contrib/mmts/tests2/docker-entrypoint.sh b/contrib/mmts/tests2/docker-entrypoint.sh
@@ -70,6 +70,8 @@ if [ "$1" = 'postgres' ]; then
 			multimaster.twopc_min_timeout = 400000
 		EOF
 
+		cat $PGDATA/postgresql.conf
+
 		pg_ctl -D "$PGDATA" -m fast -w stop
 	fi
 fi
diff --git a/contrib/mmts/tests2/test_regression.py b/contrib/mmts/tests2/test_regression.py
@@ -8,6 +8,7 @@ class RecoveryTest(unittest.TestCase):
     def setUpClass(self):
         subprocess.check_call(['docker-compose','up',
             '--force-recreate',
+            '--build',
             '-d'])
 
     @classmethod

Original file line number	Diff line number	Diff line change
`@@ -2157,8 +2157,10 @@ void MtmUpdateNodeConnectionInfo(MtmConnectionInfo* conn, char const* connStr)`
`2157`	`2157`	`elog(ERROR, "Invalid arbiter port: %s", port+12);`
`2158`	`2158`	`}`
`2159`	`2159`	`} else {`
`2160`		`- conn->arbiterPort = 0;`
	`2160`	`+ conn->arbiterPort = MULTIMASTER_DEFAULT_ARBITER_PORT;`
`2161`	`2161`	`}`
	`2162`	`+`
	`2163`	`+ elog(WARNING, "Using arbiter port: %d", conn->arbiterPort);`
`2162`	`2164`	`}`
`2163`	`2165`
`2164`	`2166`	`static void MtmSplitConnStrs(void)`
`@@ -2643,7 +2645,7 @@ _PG_init(void)`
`2643`	`2645`	`"Base value for assigning arbiter ports",`
`2644`	`2646`	`NULL,`
`2645`	`2647`	`&MtmArbiterPort,`
`2646`		`- 54320,`
	`2648`	`+ MULTIMASTER_DEFAULT_ARBITER_PORT,`
`2647`	`2649`	`0,`
`2648`	`2650`	`INT_MAX,`
`2649`	`2651`	`PGC_BACKEND,`