diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2018-11-25 16:31:16 +0100 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2018-11-25 16:33:40 +0100 |
commit | 2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85 (patch) | |
tree | 5564005e2fe623af69b01d56c9c72baf8ec68402 /src/bin/pg_rewind/RewindTest.pm | |
parent | ab69ea9feeb9a02c6299b5c1b786005552343f22 (diff) | |
download | postgresql-2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85.tar.gz postgresql-2dedf4d9a899b36d1a8ed29be5efbd1b31a8fe85.zip |
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/
Diffstat (limited to 'src/bin/pg_rewind/RewindTest.pm')
-rw-r--r-- | src/bin/pg_rewind/RewindTest.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm index 1dce56d0352..3d07da5d949 100644 --- a/src/bin/pg_rewind/RewindTest.pm +++ b/src/bin/pg_rewind/RewindTest.pm @@ -159,12 +159,13 @@ sub create_standby my $connstr_master = $node_master->connstr(); $node_standby->append_conf( - "recovery.conf", qq( + "postgresql.conf", qq( primary_conninfo='$connstr_master application_name=rewind_standby' -standby_mode=on recovery_target_timeline='latest' )); + $node_standby->set_standby_mode(); + # Start standby $node_standby->start; @@ -270,12 +271,13 @@ sub run_pg_rewind # Plug-in rewound node to the now-promoted standby node my $port_standby = $node_standby->port; $node_master->append_conf( - 'recovery.conf', qq( + 'postgresql.conf', qq( primary_conninfo='port=$port_standby' -standby_mode=on recovery_target_timeline='latest' )); + $node_master->set_standby_mode(); + # Restart the master to check that rewind went correctly $node_master->start; |