Fixes for PQconnectdb_safe

kelvich · kelvich · commit 879e50f2453e · 2017-11-13T02:23:41.000+03:00
diff --git a/multimaster.c b/multimaster.c
@@ -4193,6 +4193,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)
@@ -4202,13 +4203,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
`@@ -4193,6 +4193,7 @@ PQconnectdb_safe(const char *conninfo, int timeout)`
`4193`	`4193`	`{`
`4194`	`4194`	`MTM_ELOG(WARNING, "Could not connect to '%s': %s",`
`4195`	`4195`	`safe_connstr, PQerrorMessage(conn));`
	`4196`	`+ return conn;`
`4196`	`4197`	`}`
`4197`	`4198`
`4198`	`4199`	`if (timeout != 0)`
`@@ -4202,13 +4203,15 @@ PQconnectdb_safe(const char *conninfo, int timeout)`
`4202`	`4203`	`if (socket_fd < 0)`
`4203`	`4204`	`{`
`4204`	`4205`	`MTM_ELOG(WARNING, "Referee socket is invalid");`
	`4206`	`+ return conn;`
`4205`	`4207`	`}`
`4206`	`4208`
`4207`		`- if (setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,`
`4208`		`- (char *)&tv, sizeof(tv)) < 0)`
	`4209`	`+ if (pg_setsockopt(socket_fd, SOL_SOCKET, SO_RCVTIMEO,`
	`4210`	`+ (char *)&tv, sizeof(tv), MtmUseRDMA) < 0)`
`4209`	`4211`	`{`
`4210`	`4212`	`MTM_ELOG(WARNING, "Could not set referee socket timeout: %s",`
`4211`	`4213`	`strerror(errno));`
	`4214`	`+ return conn;`
`4212`	`4215`	`}`
`4213`	`4216`	`}`
`4214`	`4217`