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

repmgr: enable master register --force with node foreign key dependency

Browse Source 
Fixes GitHub #273
This commit is contained in:
Ian Barwick
2017-03-20 10:01:21 +09:00
parent 976a61005e
commit 1964f890be
1 changed files with 46 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
repmgr.c
View File

@@ -1873,6 +1873,7 @@ do_master_register(void)
int primary_node_id = UNKNOWN_NODE_ID; int primary_node_id = UNKNOWN_NODE_ID;
bool record_created; bool record_created;
t_node_info node_info = T_NODE_INFO_INITIALIZER;
conn = establish_db_connection(options.conninfo, true); conn = establish_db_connection(options.conninfo, true);
@@ -1945,42 +1946,54 @@ do_master_register(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
/* Delete any existing record for this node if --force set */
if (runtime_options.force)
{
bool node_record_deleted;
t_node_info node_info = T_NODE_INFO_INITIALIZER;
begin_transaction(conn);
if (get_node_record(conn, options.cluster_name, options.node, &node_info))
{
log_notice(_("deleting existing master record with id %i\n"), options.node);
node_record_deleted = delete_node_record(conn,
options.node,
"master register");
if (node_record_deleted == false)
{
rollback_transaction(conn);
PQfinish(conn);
exit(ERR_BAD_CONFIG);
}
}
} }
/* Now register the master */ begin_transaction(conn);
record_created = create_node_record(conn,
"master register", /*
options.node, * Check whether there's an existing record for this node, and
"master", * update it if --force set
NO_UPSTREAM_NODE, */
options.cluster_name, if (get_node_record(conn, options.cluster_name, options.node, &node_info))
options.node_name, {
options.conninfo, if (!runtime_options.force)
options.priority, {
repmgr_slot_name_ptr, log_err(_("this node is already registered\n"));
true); log_hint(_("use -F/--force to overwrite the existing node record\n"));
rollback_transaction(conn);
PQfinish(conn);
exit(ERR_BAD_CONFIG);
}
record_created = update_node_record(conn,
"master register",
options.node,
"master",
NO_UPSTREAM_NODE,
options.cluster_name,
options.node_name,
options.conninfo,
options.priority,
repmgr_slot_name_ptr,
true);
}
else
{
/* Now register the master */
record_created = create_node_record(conn,
"master register",
options.node,
"master",
NO_UPSTREAM_NODE,
options.cluster_name,
options.node_name,
options.conninfo,
options.priority,
repmgr_slot_name_ptr,
true);
}
if (record_created == false) if (record_created == false)
{ {