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

Don't follow the promotion candidate standby if the primary reappears

Browse Source
This commit is contained in:
Ian Barwick
2016-05-10 13:58:59 +09:00
parent d5e24689a4
commit 4dbbf40196
1 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
repmgrd.c
View File

@@ -1497,8 +1497,6 @@ do_master_failover(void)
r = system(local_options.promote_command); r = system(local_options.promote_command);
if (r != 0) if (r != 0)
{ {
int master_node_id;
/* /*
* Check whether the primary reappeared, which will have caused the * Check whether the primary reappeared, which will have caused the
* promote command to fail * promote command to fail
@@ -1507,6 +1505,8 @@ do_master_failover(void)
if (my_local_conn != NULL) if (my_local_conn != NULL)
{ {
int master_node_id;
master_conn = get_master_connection(my_local_conn, master_conn = get_master_connection(my_local_conn,
local_options.cluster_name, local_options.cluster_name,
&master_node_id, NULL); &master_node_id, NULL);
@@ -1557,9 +1557,38 @@ do_master_failover(void)
PQExpBufferData event_details; PQExpBufferData event_details;
initPQExpBuffer(&event_details); initPQExpBuffer(&event_details);
/* wait */ /* wait */
sleep(10); sleep(10);
/*
* Check whether the primary reappeared while we were waiting, so we
* don't end up following the promotion candidate
*/
my_local_conn = establish_db_connection(local_options.conninfo, false);
if (my_local_conn != NULL)
{
int master_node_id;
master_conn = get_master_connection(my_local_conn,
local_options.cluster_name,
&master_node_id, NULL);
if (master_conn != NULL && master_node_id == failed_master.node_id)
{
log_notice(_("Original master reappeared - no action taken\n"));
PQfinish(master_conn);
/* no failover occurred but we'll want to restart connections */
failover_done = true;
return;
}
PQfinish(my_local_conn);
}
/* XXX double-check the promotion candidate did become the new primary */
log_notice(_("node %d is the best candidate for new master, attempting to follow...\n"), log_notice(_("node %d is the best candidate for new master, attempting to follow...\n"),
best_candidate.node_id); best_candidate.node_id);