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

Various fixes to "repmgr node rejoin"

Browse Source
This commit is contained in:
Ian Barwick
2017-09-01 11:30:31 +09:00
parent f9f05158d2
commit edb74ccef9
3 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
repmgr-action-standby.c
View File

@@ -1657,7 +1657,6 @@ do_standby_follow_internal(PGconn *primary_conn, t_node_info *primary_node_recor
bool server_up = is_server_available(config_file_options.conninfo);
char *action = NULL;
log_debug("XXX %s\n", config_file_options.conninfo);
if (server_up == true)
{
action = "restart";
@@ -2551,25 +2550,42 @@ do_standby_switchover(void)
local_node_record.conninfo);
log_debug("executing:\n \"%s\"", remote_command_str.data);
(void)remote_command(
initPQExpBuffer(&command_output);
r = remote_command(
remote_host,
runtime_options.remote_user,
remote_command_str.data,
NULL);
&command_output);
termPQExpBuffer(&remote_command_str);
termPQExpBuffer(&node_rejoin_options);
/* TODO: verify this node's record was updated correctly */
create_event_record(local_conn,
&config_file_options,
config_file_options.node_id,
"standby_switchover",
true,
NULL);
if (r == false)
{
log_error(_("rejoin failed %i"), r);
log_detail("%s", command_output.data);
create_event_record(local_conn,
&config_file_options,
config_file_options.node_id,
"standby_switchover",
false,
command_output.data);
}
else
{
create_event_record(local_conn,
&config_file_options,
config_file_options.node_id,
"standby_switchover",
true,
NULL);
}
termPQExpBuffer(&command_output);
/* clean up remote node */
remote_conn = establish_db_connection(remote_node_record.conninfo, false);