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

When following a new primary, have repmgr (not repmgrd) create the new slot

Browse Source
This commit is contained in:
Ian Barwick
2015-11-18 13:05:29 +09:00
parent 67a81d1d47
commit 9cbd8df089
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
repmgr.c
View File

@@ -582,6 +582,7 @@ main(int argc, char **argv)
{ {
maxlen_snprintf(repmgr_slot_name, "repmgr_slot_%i", options.node); maxlen_snprintf(repmgr_slot_name, "repmgr_slot_%i", options.node);
repmgr_slot_name_ptr = repmgr_slot_name; repmgr_slot_name_ptr = repmgr_slot_name;
log_verbose(LOG_DEBUG, "slot name initialised as: %s\n", repmgr_slot_name);
} }
@@ -2031,6 +2032,39 @@ do_standby_follow(void)
strncpy(runtime_options.masterport, PQport(master_conn), MAXLEN); strncpy(runtime_options.masterport, PQport(master_conn), MAXLEN);
strncpy(runtime_options.username, PQuser(master_conn), MAXLEN); strncpy(runtime_options.username, PQuser(master_conn), MAXLEN);
/*
* If 9.4 or later, and replication slots in use, we'll need to create a
* slot on the new master
*/
if (options.use_replication_slots)
{
if (create_replication_slot(master_conn, repmgr_slot_name) == false)
{
PQExpBufferData event_details;
initPQExpBuffer(&event_details);
appendPQExpBuffer(&event_details,
_("Unable to create slot '%s' on the master node: %s"),
repmgr_slot_name,
PQerrorMessage(master_conn));
log_err("%s\n", event_details.data);
create_event_record(master_conn,
&options,
options.node,
"repmgr_follow",
false,
event_details.data);
PQfinish(conn);
PQfinish(master_conn);
exit(ERR_DB_QUERY);
}
}
log_info(_("changing standby's master\n")); log_info(_("changing standby's master\n"));
/* Get the data directory full path */ /* Get the data directory full path */

29
repmgrd.c
View File

@@ -1521,35 +1521,6 @@ do_master_failover(void)
fflush(stderr); fflush(stderr);
} }
/*
* If 9.4 or later, and replication slots in use, we'll need to create a
* slot on the new master
*/
new_master_conn = establish_db_connection(best_candidate.conninfo_str, true);
if (local_options.use_replication_slots)
{
if (create_replication_slot(new_master_conn, node_info.slot_name) == false)
{
appendPQExpBuffer(&event_details,
_("Unable to create slot '%s' on the master node: %s"),
node_info.slot_name,
PQerrorMessage(new_master_conn));
log_err("%s\n", event_details.data);
create_event_record(new_master_conn,
&local_options,
node_info.node_id,
"repmgrd_failover_follow",
false,
event_details.data);
PQfinish(new_master_conn);
terminate(ERR_DB_QUERY);
}
}
log_debug(_("executing follow command: \"%s\"\n"), local_options.follow_command); log_debug(_("executing follow command: \"%s\"\n"), local_options.follow_command);