diff options
Diffstat (limited to 'src/bin/pg_rewind')
| -rw-r--r-- | src/bin/pg_rewind/t/002_databases.pl | 6 | ||||
| -rw-r--r-- | src/bin/pg_rewind/t/RewindTest.pm | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl index 0562c21549b..f1eb4fe1d2b 100644 --- a/src/bin/pg_rewind/t/002_databases.pl +++ b/src/bin/pg_rewind/t/002_databases.pl @@ -25,17 +25,17 @@ sub run_test # replicated to the standby. master_psql('CREATE DATABASE beforepromotion'); master_psql('CREATE TABLE beforepromotion_tab (a int)', - 'beforepromotion'); + 'beforepromotion'); RewindTest::promote_standby(); # Create databases in the old master and the new promoted standby. master_psql('CREATE DATABASE master_afterpromotion'); master_psql('CREATE TABLE master_promotion_tab (a int)', - 'master_afterpromotion'); + 'master_afterpromotion'); standby_psql('CREATE DATABASE standby_afterpromotion'); standby_psql('CREATE TABLE standby_promotion_tab (a int)', - 'standby_afterpromotion'); + 'standby_afterpromotion'); # The clusters are now diverged. diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm index f477ffab1da..61904f25ff4 100644 --- a/src/bin/pg_rewind/t/RewindTest.pm +++ b/src/bin/pg_rewind/t/RewindTest.pm @@ -133,8 +133,10 @@ sub setup_cluster # Set up pg_hba.conf and pg_ident.conf for the role running # pg_rewind. This role is used for all the tests, and has # minimal permissions enough to rewind from an online source. - $node_master->init(allows_streaming => 1, extra => $extra, - auth_extra => ['--create-role', 'rewind_user']); + $node_master->init( + allows_streaming => 1, + extra => $extra, + auth_extra => [ '--create-role', 'rewind_user' ]); # Set wal_keep_segments to prevent WAL segment recycling after enforced # checkpoints in the tests. @@ -151,7 +153,8 @@ sub start_master # Create custom role which is used to run pg_rewind, and adjust its # permissions to the minimum necessary. - $node_master->psql('postgres', " + $node_master->psql( + 'postgres', " CREATE ROLE rewind_user LOGIN; GRANT EXECUTE ON function pg_catalog.pg_ls_dir(text, boolean, boolean) TO rewind_user; @@ -265,10 +268,9 @@ sub run_pg_rewind # Do rewind using a remote connection as source command_ok( [ - 'pg_rewind', "--debug", - "--source-server", $standby_connstr, - "--target-pgdata=$master_pgdata", - "--no-sync" + 'pg_rewind', "--debug", + "--source-server", $standby_connstr, + "--target-pgdata=$master_pgdata", "--no-sync" ], 'pg_rewind remote'); } |