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

Consolidate final output of "standby follow" / "node rejoin"

Browse Source
This commit is contained in:
Ian Barwick
2017-08-09 19:31:42 +09:00
parent bae82318f1
commit 4930c95ef7
3 changed files with 81 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
repmgr-action-node.c
View File

@@ -927,10 +927,13 @@ do_node_rejoin(void)
PQExpBufferData command;
PQExpBufferData command_output;
PQExpBufferData follow_output;
struct stat statbuf;
char filebuf[MAXPGPATH] = "";
t_node_info primary_node_record = T_NODE_INFO_INITIALIZER;
bool success;
/* check node is not actually running */
status = PQping(config_file_options.conninfo);
@@ -1069,8 +1072,36 @@ do_node_rejoin(void)
}
}
do_standby_follow_internal(upstream_conn, &primary_node_record);
initPQExpBuffer(&follow_output);
success = do_standby_follow_internal(
upstream_conn,
&primary_node_record,
&follow_output);
create_event_notification(
upstream_conn,
&config_file_options,
config_file_options.node_id,
"node_rejoin",
success,
follow_output.data);
PQfinish(upstream_conn);
if (success == false)
{
log_notice(_("NODE REJOIN failed"));
log_detail("%s", follow_output.data);
termPQExpBuffer(&follow_output);
exit(ERR_DB_QUERY);
}
log_notice(_("NODE REJOIN successful"));
log_detail("%s", follow_output.data);
termPQExpBuffer(&follow_output);
}
/*