Commit879e50f

committed

Fixes for PQconnectdb_safe

1 parenta539d00 commit879e50fCopy full SHA for 879e50f

File tree

-2

lines changed

-2

lines changed

Lines changed: 5 additions & 2 deletions

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`	`+returnconn;`
`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`	`+returnconn;`
`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`	`+returnconn;`
`4212`	`4215`	`}`
`4213`	`4216`	`}`
`4214`	`4217`

Comments

(0)