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

repmgr: fix "standby register --wait-sync" when no timeout provided

Browse Source 
The default value for "wait_register_sync_seconds" was zero, which is treated
as disabling --wait-sync altogether. Default value now set to -1, which is taken
to mean no timeout value supplied.
This commit is contained in:
Ian Barwick
2018-07-04 17:22:04 +09:00
parent a194cf56b3
commit 37311e15a3
4 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
repmgr-action-standby.c
View File

@@ -1708,11 +1708,15 @@ do_standby_register(void)
termPQExpBuffer(&details);
/* if --wait-sync option set, wait for the records to synchronise */
/*
* if --wait-sync option set, wait for the records to synchronise
* (unless 0 seconds provided, which disables it, which is the same as
* not providing the option)
*/
if (PQstatus(conn) == CONNECTION_OK &&
runtime_options.wait_register_sync == true &&
runtime_options.wait_register_sync_seconds > 0)
runtime_options.wait_register_sync_seconds != 0)
{
bool sync_ok = false;
int timer = 0;
@@ -1736,7 +1740,11 @@ do_standby_register(void)
{
bool records_match = true;
if (runtime_options.wait_register_sync_seconds && runtime_options.wait_register_sync_seconds == timer)
/*
* If timeout set to a positive value, check if we've reached it and
* exit the loop
*/
if (runtime_options.wait_register_sync_seconds > 0 && runtime_options.wait_register_sync_seconds == timer)
break;
node_record_status = get_node_record(conn,