]> granicus.if.org Git - postgresql/commit
Integrate recovery.conf into postgresql.conf
authorPeter Eisentraut <peter_e@gmx.net>
Sun, 25 Nov 2018 15:31:16 +0000 (16:31 +0100)
committerPeter Eisentraut <peter_e@gmx.net>
Sun, 25 Nov 2018 15:33:40 +0000 (16:33 +0100)
commit2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85
tree5564005e2fe623af69b01d56c9c72baf8ec68402
parentab69ea9feeb9a02c6299b5c1b786005552343f22
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/
40 files changed:
contrib/pg_standby/pg_standby.c
doc/src/sgml/backup.sgml
doc/src/sgml/config.sgml
doc/src/sgml/filelist.sgml
doc/src/sgml/func.sgml
doc/src/sgml/high-availability.sgml
doc/src/sgml/pgstandby.sgml
doc/src/sgml/postgres.sgml
doc/src/sgml/recovery-config.sgml [deleted file]
doc/src/sgml/ref/pg_basebackup.sgml
doc/src/sgml/ref/pg_rewind.sgml
doc/src/sgml/ref/pgarchivecleanup.sgml
doc/src/sgml/ref/pgupgrade.sgml
doc/src/sgml/release-10.sgml
doc/src/sgml/release-9.1.sgml
doc/src/sgml/release-9.4.sgml
doc/src/sgml/release-9.5.sgml
doc/src/sgml/release.sgml
src/backend/Makefile
src/backend/access/transam/recovery.conf.sample [deleted file]
src/backend/access/transam/xlog.c
src/backend/access/transam/xlogarchive.c
src/backend/commands/extension.c
src/backend/utils/misc/guc.c
src/backend/utils/misc/postgresql.conf.sample
src/bin/pg_archivecleanup/pg_archivecleanup.c
src/bin/pg_basebackup/pg_basebackup.c
src/bin/pg_basebackup/t/010_pg_basebackup.pl
src/bin/pg_rewind/RewindTest.pm
src/include/access/xlog.h
src/include/utils/guc_tables.h
src/port/quotes.c
src/test/perl/PostgresNode.pm
src/test/recovery/t/001_stream_rep.pl
src/test/recovery/t/003_recovery_targets.pl
src/test/recovery/t/004_timeline_switch.pl
src/test/recovery/t/005_replay_delay.pl
src/test/recovery/t/009_twophase.pl
src/test/recovery/t/010_logical_decoding_timelines.pl
src/test/recovery/t/012_subtransactions.pl