github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 08:06:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add a check of the connection inside the CancelQuery() so it check

Browse Source 
that before trying to cancel a query, which can block.
This commit is contained in:
Jaime Casanova
2012-06-26 11:29:02 -05:00
parent d58ea77798
commit cb740b68be
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
repmgrd.c
View File

@@ -99,7 +99,7 @@ static void setup_event_handlers(void);
#define CloseConnections() \
if (PQisBusy(primaryConn) == 1) \
CancelQuery(primaryConn); \
CancelQuery(primaryConn, local_options.master_response_timeout); \
if (myLocalConn != NULL) \
PQfinish(myLocalConn); \
if (primaryConn != NULL && primaryConn != myLocalConn) \
@@ -356,7 +356,7 @@ WitnessMonitor(void)
* Cancel any query that is still being executed,
* so i can insert the current record
*/
CancelQuery(primaryConn);
CancelQuery(primaryConn, local_options.master_response_timeout);
if (wait_connection_availability(primaryConn, local_options.master_response_timeout) != 1)
return;
@@ -473,7 +473,7 @@ StandbyMonitor(void)
* Cancel any query that is still being executed,
* so i can insert the current record
*/
CancelQuery(primaryConn);
CancelQuery(primaryConn, local_options.master_response_timeout);
if (wait_connection_availability(primaryConn, local_options.master_response_timeout) != 1)
return;