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

standby clone: fix references to "recovery.conf" for Pg 12 and later

Browse Source 
"standby clone --recovery-conf-only" still mentioned "recovery.conf" in a
couple of places; change that to the more generic "replication configuration"
for Pg 12 and later.
This commit is contained in:
Ian Barwick
2020-02-27 12:20:09 +09:00
parent f64d28bc95
commit f5124a7750
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
repmgr-action-standby.c
View File

@@ -958,6 +958,13 @@ _do_create_recovery_conf(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
/* check connection */
source_conn = establish_db_connection_by_params(&source_conninfo, true);
/* Verify that source is a supported server version */
(void) check_server_version(source_conn, "source node", true, NULL);
/* /*
* Do some sanity checks on the data directory to make sure * Do some sanity checks on the data directory to make sure
* it contains a valid but dormant instance * it contains a valid but dormant instance
@@ -967,14 +974,17 @@ _do_create_recovery_conf(void)
case DIR_ERROR: case DIR_ERROR:
log_error(_("unable to access specified data directory \"%s\""), local_data_directory); log_error(_("unable to access specified data directory \"%s\""), local_data_directory);
log_detail("%s", strerror(errno)); log_detail("%s", strerror(errno));
PQfinish(source_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
break; break;
case DIR_NOENT: case DIR_NOENT:
log_error(_("specified data directory \"%s\" does not exist"), local_data_directory); log_error(_("specified data directory \"%s\" does not exist"), local_data_directory);
PQfinish(source_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
break; break;
case DIR_EMPTY: case DIR_EMPTY:
log_error(_("specified data directory \"%s\" is empty"), local_data_directory); log_error(_("specified data directory \"%s\" is empty"), local_data_directory);
PQfinish(source_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
break; break;
case DIR_NOT_EMPTY: case DIR_NOT_EMPTY:
@@ -982,6 +992,7 @@ _do_create_recovery_conf(void)
if (!is_pg_dir(local_data_directory)) if (!is_pg_dir(local_data_directory))
{ {
log_error(_("specified data directory \"%s\" does not contain a PostgreSQL instance"), local_data_directory); log_error(_("specified data directory \"%s\" does not contain a PostgreSQL instance"), local_data_directory);
PQfinish(source_conn);
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -991,7 +1002,16 @@ _do_create_recovery_conf(void)
{ {
log_error(_("specified data directory \"%s\" appears to contain a running PostgreSQL instance"), log_error(_("specified data directory \"%s\" appears to contain a running PostgreSQL instance"),
local_data_directory); local_data_directory);
log_hint(_("use -F/--force to create \"recovery.conf\" anyway"));
if (PQserverVersion(source_conn) >= 120000)
{
log_hint(_("use -F/--force to create replication configuration anyway"));
}
else
{
log_hint(_("use -F/--force to create \"recovery.conf\" anyway"));
}
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
@@ -999,11 +1019,25 @@ _do_create_recovery_conf(void)
if (runtime_options.dry_run == true) if (runtime_options.dry_run == true)
{ {
log_warning(_("\"recovery.conf\" would be created in an active data directory")); if (PQserverVersion(source_conn) >= 120000)
{
log_warning(_("replication configuration would be created in an active data directory"));
}
else
{
log_warning(_("\"recovery.conf\" would be created in an active data directory"));
}
} }
else else
{ {
log_warning(_("creating \"recovery.conf\" in an active data directory")); if (PQserverVersion(source_conn) >= 120000)
{
log_warning(_("creating replication configuration in an active data directory"));
}
else
{
log_warning(_("creating \"recovery.conf\" in an active data directory"));
}
} }
} }
break; break;
@@ -1011,11 +1045,6 @@ _do_create_recovery_conf(void)
break; break;
} }
/* check connection */
source_conn = establish_db_connection_by_params(&source_conninfo, true);
/* Verify that source is a supported server version */
(void) check_server_version(source_conn, "source node", true, NULL);
/* determine node for primary_conninfo */ /* determine node for primary_conninfo */