Integrate recovery.conf into postgresql.conf

Peter Eisentraut <peter_e@gmx.net>

Commit: 2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85
Author: Peter Eisentraut <peter_e@gmx.net>
Date: 2018-11-25T15:33:40Z
Releases: 12.0
Integrate recovery.conf into postgresql.conf

recovery.conf settings are now set in postgresql.conf (or other GUC
sources).  Currently, all the affected settings are PGC_POSTMASTER;
this could be refined in the future case by case.

Recovery is now initiated by a file recovery.signal.  Standby mode is
initiated by a file standby.signal.  The standby_mode setting is
gone.  If a recovery.conf file is found, an error is issued.

The trigger_file setting has been renamed to promote_trigger_file as
part of the move.

The documentation chapter "Recovery Configuration" has been integrated
into "Server Configuration".

pg_basebackup -R now appends settings to postgresql.auto.conf and
creates a standby.signal file.

Author: Fujii Masao <masao.fujii@gmail.com>
Author: Simon Riggs <simon@2ndquadrant.com>
Author: Abhijit Menon-Sen <ams@2ndquadrant.com>
Author: Sergei Kornilov <sk@zsrv.org>
Discussion: https://www.postgresql.org/message-id/flat/607741529606767@web3g.yandex.ru/

Files

PathChange+/−
contrib/pg_standby/pg_standby.c modified +1 −1
doc/src/sgml/backup.sgml modified +11 −11
doc/src/sgml/config.sgml modified +510 −5
doc/src/sgml/filelist.sgml modified +0 −1
doc/src/sgml/func.sgml modified +1 −1
doc/src/sgml/high-availability.sgml modified +23 −33
doc/src/sgml/pgstandby.sgml modified +1 −1
doc/src/sgml/postgres.sgml modified +0 −1
doc/src/sgml/recovery-config.sgml deleted +0 −510
doc/src/sgml/ref/pgarchivecleanup.sgml modified +2 −2
doc/src/sgml/ref/pg_basebackup.sgml modified +4 −3
doc/src/sgml/ref/pg_rewind.sgml modified +5 −3
doc/src/sgml/ref/pgupgrade.sgml modified +1 −1
doc/src/sgml/release-10.sgml modified +1 −1
doc/src/sgml/release-9.1.sgml modified +2 −3
doc/src/sgml/release-9.4.sgml modified +7 −8
doc/src/sgml/release-9.5.sgml modified +5 −6
doc/src/sgml/release.sgml modified +1 −2
src/backend/access/transam/recovery.conf.sample deleted +0 −158
src/backend/access/transam/xlogarchive.c modified +2 −2
src/backend/access/transam/xlog.c modified +163 −337
src/backend/commands/extension.c modified +2 −2
src/backend/Makefile modified +1 −3
src/backend/utils/misc/guc.c modified +421 −0
src/backend/utils/misc/postgresql.conf.sample modified +47 −0
src/bin/pg_archivecleanup/pg_archivecleanup.c modified +1 −1
src/bin/pg_basebackup/pg_basebackup.c modified +108 −40
src/bin/pg_basebackup/t/010_pg_basebackup.pl modified +6 −9
src/bin/pg_rewind/RewindTest.pm modified +6 −4
src/include/access/xlog.h modified +36 −3
src/include/utils/guc_tables.h modified +2 −0
src/port/quotes.c modified +1 −1
src/test/perl/PostgresNode.pm modified +20 −6
src/test/recovery/t/001_stream_rep.pl modified +2 −2
src/test/recovery/t/003_recovery_targets.pl modified +1 −1
src/test/recovery/t/004_timeline_switch.pl modified +1 −3
src/test/recovery/t/005_replay_delay.pl modified +1 −1
src/test/recovery/t/009_twophase.pl modified +3 −3
src/test/recovery/t/010_logical_decoding_timelines.pl modified +1 −1
src/test/recovery/t/012_subtransactions.pl modified +3 −3

Documentation touched

Discussion

Cited messages not in the archive: 607741529606767@web3g.yandex.ru/