github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-27 17:06:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

repmgr: improve STANDBY REGISTER sanity checks and log messages

Browse Source
This commit is contained in:
Ian Barwick
2016-12-14 12:38:42 +09:00
parent 46740b64a9
commit 79748f28f1
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
repmgr.c
View File

@@ -2007,7 +2007,7 @@ do_standby_register(void)
int node_result; int node_result;
log_info(_("connecting to standby database\n")); log_info(_("connecting to standby database\n"));
conn = establish_db_connection(options.conninfo, false); conn = establish_db_connection_quiet(options.conninfo);
if (PQstatus(conn) != CONNECTION_OK) if (PQstatus(conn) != CONNECTION_OK)
{ {
@@ -2016,11 +2016,17 @@ do_standby_register(void)
log_err(_("unable to connect to local node %i (\"%s\")\n"), log_err(_("unable to connect to local node %i (\"%s\")\n"),
options.node, options.node,
options.node_name); options.node_name);
log_hint(_("use option -F/--force to register a standby which is not running")); log_hint(_("use option -F/--force to register a standby which is not running\n"));
if (PQstatus(conn) == CONNECTION_OK) if (PQstatus(conn) == CONNECTION_OK)
PQfinish(conn); PQfinish(conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
if (!runtime_options.connection_param_provided)
{
log_err(_("unable to connect to local node %i (\"%s\") and no master connection parameters provided\n"));
exit(ERR_BAD_CONFIG);
}
} }
@@ -2062,7 +2068,8 @@ do_standby_register(void)
*/ */
if (PQstatus(master_conn) != CONNECTION_OK) if (PQstatus(master_conn) != CONNECTION_OK)
{ {
log_err(_("a master must be defined before configuring a standby\n")); log_err(_("unable to connect to the master database\n"));
log_hint(_("a master must be defined before configuring a standby\n"));
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -7050,11 +7057,15 @@ check_parameters_for_action(const int action)
case STANDBY_REGISTER: case STANDBY_REGISTER:
/* /*
* To register a standby we only need the repmgr.conf we don't * To register a standby we only need the repmgr.conf; usually
* need connection parameters to the master because we can detect * we don't need connection parameters to the master because we
* the master in repl_nodes * can detect the master in repl_nodes. However in certain cases
* it may be desirable to register a standby which hasn't yet
* been started, which requires the use of --force *and* provision
* of the master connection string, in which case we don't need the
* warning.
*/ */
if (runtime_options.connection_param_provided) if (runtime_options.connection_param_provided && runtime_options.force == false)
{ {
item_list_append(&cli_warnings, _("master connection parameters not required when executing STANDBY REGISTER")); item_list_append(&cli_warnings, _("master connection parameters not required when executing STANDBY REGISTER"));
} }