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

Ensure witness node is registered before the repl_nodes table is copied

Browse Source 
This fixes a bug introduced into the previous commit, where the
witness node was registered last to prevent a spurious node record
being created even if witness server creation failed.
This commit is contained in:
Ian Barwick
2016-02-18 17:46:33 +09:00
committed by Ian Barwick
parent b3d8a68a1d
commit 009d92fec8
1 changed files with 54 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
repmgr.c
View File

@@ -3715,11 +3715,11 @@ do_witness_create(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
log_info(_("starting copy of configuration from master...\n")); log_info(_("starting copy of configuration from master...\n"));
begin_transaction(witnessconn); begin_transaction(witnessconn);
if (!create_schema(witnessconn)) if (!create_schema(witnessconn))
{ {
rollback_transaction(witnessconn); rollback_transaction(witnessconn);
@@ -3736,45 +3736,11 @@ do_witness_create(void)
commit_transaction(witnessconn); commit_transaction(witnessconn);
/* copy configuration from master, only repl_nodes is needed */ /*
if (!copy_configuration(masterconn, witnessconn, options.cluster_name)) * Register new witness server on the primary
{ * Do this as late as possible to avoid having to delete
create_event_record(masterconn, * the record if the server creation fails
&options, */
options.node,
"witness_create",
false,
_("Unable to copy configuration from master"));
PQfinish(masterconn);
PQfinish(witnessconn);
exit(ERR_BAD_CONFIG);
}
/* drop superuser powers if needed */
if (strcmp(repmgr_user, "postgres") != 0)
{
sqlquery_snprintf(sqlquery, "ALTER ROLE %s NOSUPERUSER", repmgr_user);
log_info(_("revoking superuser status on user %s: %s.\n"),
repmgr_user, sqlquery);
log_debug(_("witness create: %s\n"), sqlquery);
res = PQexec(witnessconn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
log_err(_("Unable to alter user privileges for user %s: %s\n"),
repmgr_user,
PQerrorMessage(witnessconn));
PQfinish(masterconn);
PQfinish(witnessconn);
exit(ERR_DB_QUERY);
}
}
/* Finished with the witness server */
PQfinish(witnessconn);
/* Finally, register ourselves with the master */
if (runtime_options.force) if (runtime_options.force)
{ {
@@ -3813,6 +3779,54 @@ do_witness_create(void)
exit(ERR_DB_QUERY); exit(ERR_DB_QUERY);
} }
/* copy configuration from master, only repl_nodes is needed */
if (!copy_configuration(masterconn, witnessconn, options.cluster_name))
{
create_event_record(masterconn,
&options,
options.node,
"witness_create",
false,
_("Unable to copy configuration from master"));
/*
* delete previously created witness node record
* XXX maybe set inactive?
*/
delete_node_record(masterconn,
options.node,
"witness create");
PQfinish(masterconn);
PQfinish(witnessconn);
exit(ERR_BAD_CONFIG);
}
/* drop superuser powers if needed */
if (strcmp(repmgr_user, "postgres") != 0)
{
sqlquery_snprintf(sqlquery, "ALTER ROLE %s NOSUPERUSER", repmgr_user);
log_info(_("revoking superuser status on user %s: %s.\n"),
repmgr_user, sqlquery);
log_debug(_("witness create: %s\n"), sqlquery);
res = PQexec(witnessconn, sqlquery);
if (!res || PQresultStatus(res) != PGRES_COMMAND_OK)
{
log_err(_("Unable to alter user privileges for user %s: %s\n"),
repmgr_user,
PQerrorMessage(witnessconn));
PQfinish(masterconn);
PQfinish(witnessconn);
exit(ERR_DB_QUERY);
}
}
/* Finished with the witness server */
PQfinish(witnessconn);
/* Log the event */ /* Log the event */
create_event_record(masterconn, create_event_record(masterconn,
&options, &options,