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

repmgr: consolidate code in "standby switchover"

Browse Source 
Commit 41274f5525 left us with two if statements
in sequence with exactly the same condition, so consolidate both into a single
statement. Clarify code comments while we're at it.
This commit is contained in:
Ian Barwick
2018-06-11 15:14:40 +09:00
parent 3b0cde2846
commit bb320a64f5
1 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
repmgr-action-node.c
View File

@@ -1796,30 +1796,33 @@ do_node_rejoin(void)
} }
/* /*
* If --force-rewind specified, check pg_rewind can be used, and * --force-rewind specified - check prerequisites, and attempt to execute
* pre-emptively fetch the list of configuration files which should be * (if --dry-run provided, just output the command which would be executed)
* archived
*/ */
if (runtime_options.force_rewind_used == true) if (runtime_options.force_rewind_used == true)
{ {
PQExpBufferData reason;
PQExpBufferData msg; PQExpBufferData msg;
PQExpBufferData filebuf;
int ret;
initPQExpBuffer(&reason); /*
* Check that pg_rewind can be used
*/
if (can_use_pg_rewind(upstream_conn, config_file_options.data_directory, &reason) == false) initPQExpBuffer(&msg);
if (can_use_pg_rewind(upstream_conn, config_file_options.data_directory, &msg) == false)
{ {
log_error(_("--force-rewind specified but pg_rewind cannot be used")); log_error(_("--force-rewind specified but pg_rewind cannot be used"));
log_detail("%s", reason.data); log_detail("%s", msg.data);
termPQExpBuffer(&reason); termPQExpBuffer(&msg);
PQfinish(upstream_conn); PQfinish(upstream_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
termPQExpBuffer(&reason);
initPQExpBuffer(&msg);
appendPQExpBuffer(&msg, appendPQExpBuffer(&msg,
_("prerequisites for using pg_rewind are met")); _("prerequisites for using pg_rewind are met"));
@@ -1832,20 +1835,14 @@ do_node_rejoin(void)
log_verbose(LOG_INFO, "%s", msg.data); log_verbose(LOG_INFO, "%s", msg.data);
} }
termPQExpBuffer(&msg); termPQExpBuffer(&msg);
}
/*
* Forcibly rewind node if requested (this is mainly for use when this
* action is being executed by "repmgr standby switchover")
*/
if (runtime_options.force_rewind_used == true)
{
int ret;
PQExpBufferData filebuf;
/*
* Archive requested configuration files.
*
* In --dry-run mode this acts as a check that the files can be archived, though
* errors will only be logged; any copied files will be deleted and --dry-run
* execution will continue.
*/
_do_node_archive_config(); _do_node_archive_config();
/* execute pg_rewind */ /* execute pg_rewind */