github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Rename/add configuration file options

Browse Source 
In previous versions of repmgr, some options had ambiguous meanings,
and/or were used for slightly different purposes. This way we end
up with a couple more options (most of which probably won't need
adjusting) but greater clarity and flexibility.

Removed:

  master_reponse_timeout:
    renamed to "async_query_timeout", as this was its main usage

  retry_promote_interval_secs:
    replaced by "primary_notification_timeout"

Added:
  async_query_timeout:
    timeout (in seconds) when executing asynchronous queries

  primary_notification_timeout:
    number of seconds to wait for notification from the new primary
    after a failover

  primary_follow_timeout:
    number of seconds to wait for the new primary to become available
    when executing "repmgr standby follow"
This commit is contained in:
Ian Barwick
2017-07-25 11:05:15 +09:00
parent cbe19d5868
commit 56b2e9bb84
7 changed files with 90 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repmgrd-physical.c
View File

@@ -749,7 +749,7 @@ monitor_streaming_standby(void)
check_connection(&local_node_info, local_conn);
sleep(1);
sleep(config_file_options.monitor_interval_secs);
}
#endif
}
@@ -1336,11 +1336,9 @@ poll_best_candidate(NodeInfoList *standby_nodes)
static bool
wait_primary_notification(int *new_primary_id)
{
// XXX make this configurable
int wait_primary_timeout = 60;
int i;
for (i = 0; i < wait_primary_timeout; i++)
for (i = 0; i < config_file_options.primary_notification_timeout; i++)
{
if (get_new_primary(local_conn, new_primary_id) == true)
{
@@ -1353,7 +1351,7 @@ wait_primary_notification(int *new_primary_id)
log_warning(_("no notification received from new primary after %i seconds"),
wait_primary_timeout);
config_file_options.primary_notification_timeout);
monitoring_state = MS_DEGRADED;
INSTR_TIME_SET_CURRENT(degraded_monitoring_start);
@@ -1866,7 +1864,7 @@ close_connections_physical()
{
/* cancel any pending queries to the primary */
if (PQisBusy(primary_conn) == 1)
cancel_query(primary_conn, config_file_options.primary_response_timeout);
cancel_query(primary_conn, config_file_options.async_query_timeout);
PQfinish(primary_conn);
primary_conn = NULL;
}