pgsql: Integrate recovery.conf into postgresql.conf
От | Peter Eisentraut |
---|---|
Тема | pgsql: Integrate recovery.conf into postgresql.conf |
Дата | |
Msg-id | E1gQwex-0001Vd-OW@gemulon.postgresql.org обсуждение исходный текст |
Список | pgsql-committers |
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/ Branch ------ master Details ------- https://git.postgresql.org/pg/commitdiff/2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85 Modified Files -------------- contrib/pg_standby/pg_standby.c | 2 +- doc/src/sgml/backup.sgml | 22 +- doc/src/sgml/config.sgml | 515 ++++++++++++++++++++- doc/src/sgml/filelist.sgml | 1 - doc/src/sgml/func.sgml | 2 +- doc/src/sgml/high-availability.sgml | 56 +-- doc/src/sgml/pgstandby.sgml | 2 +- doc/src/sgml/postgres.sgml | 1 - doc/src/sgml/recovery-config.sgml | 510 -------------------- doc/src/sgml/ref/pg_basebackup.sgml | 7 +- doc/src/sgml/ref/pg_rewind.sgml | 8 +- doc/src/sgml/ref/pgarchivecleanup.sgml | 4 +- doc/src/sgml/ref/pgupgrade.sgml | 2 +- doc/src/sgml/release-10.sgml | 2 +- doc/src/sgml/release-9.1.sgml | 5 +- doc/src/sgml/release-9.4.sgml | 15 +- doc/src/sgml/release-9.5.sgml | 11 +- doc/src/sgml/release.sgml | 3 +- src/backend/Makefile | 4 +- src/backend/access/transam/recovery.conf.sample | 158 ------- src/backend/access/transam/xlog.c | 500 +++++++------------- src/backend/access/transam/xlogarchive.c | 4 +- src/backend/commands/extension.c | 4 +- src/backend/utils/misc/guc.c | 421 +++++++++++++++++ src/backend/utils/misc/postgresql.conf.sample | 47 ++ src/bin/pg_archivecleanup/pg_archivecleanup.c | 2 +- src/bin/pg_basebackup/pg_basebackup.c | 148 ++++-- src/bin/pg_basebackup/t/010_pg_basebackup.pl | 15 +- src/bin/pg_rewind/RewindTest.pm | 10 +- src/include/access/xlog.h | 39 +- src/include/utils/guc_tables.h | 2 + src/port/quotes.c | 2 +- src/test/perl/PostgresNode.pm | 26 +- src/test/recovery/t/001_stream_rep.pl | 4 +- src/test/recovery/t/003_recovery_targets.pl | 2 +- src/test/recovery/t/004_timeline_switch.pl | 4 +- src/test/recovery/t/005_replay_delay.pl | 2 +- src/test/recovery/t/009_twophase.pl | 6 +- .../recovery/t/010_logical_decoding_timelines.pl | 2 +- src/test/recovery/t/012_subtransactions.pl | 6 +- 40 files changed, 1403 insertions(+), 1173 deletions(-)
В списке pgsql-committers по дате отправления:
Следующее
От: Michael PaquierДата:
Сообщение: pgsql: Add PGXS options to control TAP and isolation tests