repmgrd: fixes to configuration reload mechanism

This commit is contained in:
Ian Barwick
2016-11-02 23:23:26 +09:00
parent e274a2cbcb
commit 26f73686e5
2 changed files with 8 additions and 6 deletions

View File

@@ -571,6 +571,9 @@ parse_line(char *buf, char *name, char *value)
* changeable options: * changeable options:
* - failover * - failover
* - follow_command * - follow_command
* - logfacility
* - logfile
* - loglevel
* - master_response_timeout * - master_response_timeout
* - monitor_interval_secs * - monitor_interval_secs
* - priority * - priority
@@ -583,7 +586,6 @@ parse_line(char *buf, char *name, char *value)
* non-changeable options: * non-changeable options:
* - cluster_name * - cluster_name
* - conninfo * - conninfo
* - logfile
* - node * - node
* - node_name * - node_name
* *
@@ -595,7 +597,7 @@ bool
reload_config(t_configuration_options *orig_options) reload_config(t_configuration_options *orig_options)
{ {
PGconn *conn; PGconn *conn;
t_configuration_options new_options; t_configuration_options new_options = T_CONFIGURATION_OPTIONS_INITIALIZER;
bool config_changed = false; bool config_changed = false;
bool log_config_changed = false; bool log_config_changed = false;

View File

@@ -654,8 +654,8 @@ witness_monitor(void)
* Update the repl_nodes table from the new master to reflect the changed * Update the repl_nodes table from the new master to reflect the changed
* node configuration * node configuration
* *
* XXX it would be neat to be able to handle this with e.g. table-based * It would be neat to be able to handle this with e.g. table-based
* logical replication * logical replication if available in core
*/ */
witness_copy_node_records(master_conn, my_local_conn, local_options.cluster_name); witness_copy_node_records(master_conn, my_local_conn, local_options.cluster_name);
@@ -1014,8 +1014,8 @@ standby_monitor(void)
* *
* We should log a message so the user knows of the situation at hand. * We should log a message so the user knows of the situation at hand.
* *
* XXX check if the original master is still active and display a * XXX check if the original master is still active and display a warning
* warning * XXX add event notification
*/ */
log_err(_("It seems this server was promoted manually (not by repmgr) so you might by in the presence of a split-brain.\n")); log_err(_("It seems this server was promoted manually (not by repmgr) so you might by in the presence of a split-brain.\n"));
log_err(_("Check your cluster and manually fix any anomaly.\n")); log_err(_("Check your cluster and manually fix any anomaly.\n"));