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

repmgrd: ensure shmem is reinitialised after a restart

Browse Source
This commit is contained in:
Ian Barwick
2017-11-09 19:28:18 +09:00
parent d80763f974
commit fed17d49e3
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
repmgrd-physical.c
View File

@@ -1574,7 +1574,6 @@ notify_followers(NodeInfoList *standby_nodes, int follow_node_id)
} }
static bool static bool
wait_primary_notification(int *new_primary_id) wait_primary_notification(int *new_primary_id)
{ {
@@ -1584,14 +1583,13 @@ wait_primary_notification(int *new_primary_id)
{ {
if (get_new_primary(local_conn, new_primary_id) == true) if (get_new_primary(local_conn, new_primary_id) == true)
{ {
log_debug("new primary is %i; elapsed: %i", log_debug("new primary is %i; elapsed: %i seconds",
*new_primary_id, i); *new_primary_id, i);
return true; return true;
} }
sleep(1); sleep(1);
} }
log_warning(_("no notification received from new primary after %i seconds"), log_warning(_("no notification received from new primary after %i seconds"),
config_file_options.primary_notification_timeout); config_file_options.primary_notification_timeout);
@@ -1681,7 +1679,6 @@ follow_new_primary(int new_primary_id)
log_debug(_("standby follow command is:\n \"%s\""), log_debug(_("standby follow command is:\n \"%s\""),
parsed_follow_command); parsed_follow_command);
/* execute the follow command */ /* execute the follow command */
r = system(parsed_follow_command); r = system(parsed_follow_command);
@@ -1722,6 +1719,7 @@ follow_new_primary(int new_primary_id)
} }
/* /*
* refresh local copy of local and primary node records - we get these * refresh local copy of local and primary node records - we get these
* directly from the primary to ensure they're the current version * directly from the primary to ensure they're the current version
@@ -1744,8 +1742,11 @@ follow_new_primary(int new_primary_id)
return FAILOVER_STATE_FOLLOW_FAIL; return FAILOVER_STATE_FOLLOW_FAIL;
} }
/* refresh shared memory settings which will have been zapped by the restart */
local_conn = establish_db_connection(local_node_info.conninfo, false); local_conn = establish_db_connection(local_node_info.conninfo, false);
repmgrd_set_local_node_id(local_conn, config_file_options.node_id);
initPQExpBuffer(&event_details); initPQExpBuffer(&event_details);
appendPQExpBuffer(&event_details, appendPQExpBuffer(&event_details,
_("node %i now following new upstream node %i"), _("node %i now following new upstream node %i"),