Fix RDMS build of multimaster

knizhnik · kelvich · commit feaa8916cb94 · 2017-11-13T02:17:39.000+03:00
diff --git a/arbiter.c b/arbiter.c
@@ -214,7 +214,7 @@ static int MtmWaitSocket(int sd, bool forWrite, timestamp_t timeoutMsec)
 		FD_SET(sd, &set); 
 		tv.tv_sec = (deadline - now)/USECS_PER_SEC; 
 		tv.tv_usec = (deadline - now)%USECS_PER_SEC;
-	} while ((rc = pg_select([sd+1, forWrite ? NULL : &set, forWrite ? &set : NULL, NULL, &tv, MtmUseRDMA)) < 0 && errno == EINTR);
+	} while ((rc = pg_select(sd+1, forWrite ? NULL : &set, forWrite ? &set : NULL, NULL, &tv, MtmUseRDMA)) < 0 && errno == EINTR);
 
 	return rc;
 }
@@ -688,7 +688,7 @@ static void MtmAcceptIncomingConnections()
 	if (gateway < 0) {
 		MTM_ELOG(ERROR, "Arbiter failed to create socket: %s", strerror(errno));
 	}
-    if (pg_setsockopt(gateway, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on) < 0) {
+    if (pg_setsockopt(gateway, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on, MtmUseRDMA) < 0) {
 		MTM_ELOG(ERROR, "Arbiter failed to set options for socket: %s", strerror(errno));
 	}			
 
diff --git a/pglogical_receiver.c b/pglogical_receiver.c
@@ -23,7 +23,6 @@
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "pg_socket.h"
-#include "libpq-fe.h"
 #include "pqexpbuffer.h"
 #include "access/xact.h"
 #include "access/clog.h"
@@ -42,6 +41,7 @@
 #include "replication/origin.h"
 #include "utils/portal.h"
 #include "tcop/pquery.h"
+#include "libpq-int.h"
 
 #include "multimaster.h"
 #include "spill.h"

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,7 @@ static int MtmWaitSocket(int sd, bool forWrite, timestamp_t timeoutMsec)`
`214`	`214`	`FD_SET(sd, &set);`
`215`	`215`	`tv.tv_sec = (deadline - now)/USECS_PER_SEC;`
`216`	`216`	`tv.tv_usec = (deadline - now)%USECS_PER_SEC;`
`217`		`- } while ((rc = pg_select([sd+1, forWrite ? NULL : &set, forWrite ? &set : NULL, NULL, &tv, MtmUseRDMA)) < 0 && errno == EINTR);`
	`217`	`+ } while ((rc = pg_select(sd+1, forWrite ? NULL : &set, forWrite ? &set : NULL, NULL, &tv, MtmUseRDMA)) < 0 && errno == EINTR);`
`218`	`218`
`219`	`219`	`return rc;`
`220`	`220`	`}`
`@@ -688,7 +688,7 @@ static void MtmAcceptIncomingConnections()`
`688`	`688`	`if (gateway < 0) {`
`689`	`689`	`MTM_ELOG(ERROR, "Arbiter failed to create socket: %s", strerror(errno));`
`690`	`690`	`}`
`691`		`- if (pg_setsockopt(gateway, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on) < 0) {`
	`691`	`+ if (pg_setsockopt(gateway, SOL_SOCKET, SO_REUSEADDR, (char*)&on, sizeof on, MtmUseRDMA) < 0) {`
`692`	`692`	`MTM_ELOG(ERROR, "Arbiter failed to set options for socket: %s", strerror(errno));`
`693`	`693`	`}`
`694`	`694`