repmgrd: more fixes to BDR recovery handling

This commit is contained in:
Ian Barwick
2017-07-27 16:33:41 +09:00
parent b4a655d074
commit 4cf66c33db
4 changed files with 52 additions and 42 deletions

View File

@@ -254,7 +254,6 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
/* BDR settings
* ------------ */
options->bdr_local_monitoring_only = false;
options->bdr_active_node_recovery = false;
options->bdr_recovery_timeout = DEFAULT_BDR_RECOVERY_TIMEOUT;
/* service settings
@@ -431,10 +430,8 @@ _parse_config(t_configuration_options *options, ItemList *error_list, ItemList *
/* BDR settings */
else if (strcmp(name, "bdr_local_monitoring_only") == 0)
options->bdr_local_monitoring_only = parse_bool(value, name, error_list);
else if (strcmp(name, "bdr_active_node_recovery") == 0)
options->bdr_active_node_recovery = parse_bool(value, name, error_list);
else if (strcmp(name, "bdr_recovery_timeout") == 0)
options->bdr_active_node_recovery = repmgr_atoi(value, name, error_list, 0);
options->bdr_recovery_timeout = repmgr_atoi(value, name, error_list, 0);
/* service settings */
else if (strcmp(name, "pg_ctl_options") == 0)