Fixes for PQconnectdb_safe

kelvich · kelvich · commit bb7ffebd6a5c · 2017-09-26T21:08:45.000+03:00
diff --git a/contrib/mmts/multimaster.c b/contrib/mmts/multimaster.c
@@ -4197,6 +4197,7 @@ PQconnectdb_safe(const char *conninfo, int timeout)
 	{
 		MTM_ELOG(WARNING, "Could not connect to '%s': %s",
 			safe_connstr, PQerrorMessage(conn));
+		return conn;
 	}
 
 	if (timeout != 0)
@@ -4206,13 +4207,15 @@ PQconnectdb_safe(const char *conninfo, int timeout)
 		if (socket_fd < 0)
 		{
 			MTM_ELOG(WARNING, "Referee socket is invalid");
+			return conn;
 		}
 
-		if (setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,
-									(char *)&tv, sizeof(tv)) < 0)
+		if (pg_setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,
+									(char *)&tv, sizeof(tv), MtmUseRDMA) < 0)
 		{
 			MTM_ELOG(WARNING, "Could not set referee socket timeout: %s",
 						strerror(errno));
+			return conn;
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -4197,6 +4197,7 @@ PQconnectdb_safe(const char *conninfo, int timeout)`
`4197`	`4197`	`{`
`4198`	`4198`	`MTM_ELOG(WARNING, "Could not connect to '%s': %s",`
`4199`	`4199`	`safe_connstr, PQerrorMessage(conn));`
	`4200`	`+ return conn;`
`4200`	`4201`	`}`
`4201`	`4202`
`4202`	`4203`	`if (timeout != 0)`
`@@ -4206,13 +4207,15 @@ PQconnectdb_safe(const char *conninfo, int timeout)`
`4206`	`4207`	`if (socket_fd < 0)`
`4207`	`4208`	`{`
`4208`	`4209`	`MTM_ELOG(WARNING, "Referee socket is invalid");`
	`4210`	`+ return conn;`
`4209`	`4211`	`}`
`4210`	`4212`
`4211`		`- if (setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,`
`4212`		`- (char *)&tv, sizeof(tv)) < 0)`
	`4213`	`+ if (pg_setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,`
	`4214`	`+ (char *)&tv, sizeof(tv), MtmUseRDMA) < 0)`
`4213`	`4215`	`{`
`4214`	`4216`	`MTM_ELOG(WARNING, "Could not set referee socket timeout: %s",`
`4215`	`4217`	`strerror(errno));`
	`4218`	`+ return conn;`
`4216`	`4219`	`}`
`4217`	`4220`	`}`
`4218`	`4221`