diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2016-02-29 20:01:54 -0500 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2016-03-18 23:56:03 +0100 |
| commit | b555ed8102672cfedb06559952b8341756386d69 (patch) | |
| tree | 6e3174c6e0bcd2faee09307092ecdca5dd0169b9 /src/backend/access/transam/xlogfuncs.c | |
| parent | 4e1d2a170836028370675922ea9a690648d3c18d (diff) | |
| download | postgresql-b555ed8102672cfedb06559952b8341756386d69.tar.gz postgresql-b555ed8102672cfedb06559952b8341756386d69.zip | |
Merge wal_level "archive" and "hot_standby" into new name "replica"
The distinction between "archive" and "hot_standby" existed only because
at the time "hot_standby" was added, there was some uncertainty about
stability. This is now a long time ago. We would like to move forward
with simplifying the replication configuration, but this distinction is
in the way, because a primary server cannot tell (without asking a
standby or predicting the future) which one of these would be the
appropriate level.
Pick a new name for the combined setting to make it clearer that it
covers all (non-logical) backup and replication uses. The old values
are still accepted but are converted internally.
Reviewed-by: Michael Paquier <michael.paquier@gmail.com>
Reviewed-by: David Steele <david@pgmasters.net>
Diffstat (limited to 'src/backend/access/transam/xlogfuncs.c')
| -rw-r--r-- | src/backend/access/transam/xlogfuncs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c index 31cbb01ce47..9ec6b2ae4f1 100644 --- a/src/backend/access/transam/xlogfuncs.c +++ b/src/backend/access/transam/xlogfuncs.c @@ -154,7 +154,7 @@ pg_create_restore_point(PG_FUNCTION_ARGS) ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE), errmsg("WAL level not sufficient for creating a restore point"), - errhint("wal_level must be set to \"archive\", \"hot_standby\", or \"logical\" at server start."))); + errhint("wal_level must be set to \"replica\" or \"logical\" at server start."))); restore_name_str = text_to_cstring(restore_name); |