mirror of
https://github.com/postgres/postgres.git
synced 2025-06-26 12:21:12 +03:00
dcf2a0db85
This fixes an issue introduced by 266b6ac, which has added filters to
exclude file patterns on the target and source data directories to
reduce the number of files transferred. Filters get applied to both
the target and source data files, and include pg_internal.init which is
present for each database once relations are created on it. However, if
the target differed from the source with at least one new database with
relations, the rewind would fail due to the exclusion filters applied on
the target files, causing pg_internal.init to still be present on the
target database folder, while its contents should have been completely
removed so as there is nothing remaining inside at the time of the
folder deletion.
Applying exclusion filters on the source files is fine, because this way
the amount of data copied from the source to the target is reduced. And
actually, not applying the filters on the target is what pg_rewind
should do, because this causes such files to be automatically removed
during the rewind on the target. Exclusion filters apply to paths which
are removed or recreated automatically at startup, so removing all those
files on the target during the rewind is a win.
The existing set of TAP tests already stresses the rewind of databases,
but it did not include any tables on those newly-created databases.
Creating extra tables in this case is enough to reproduce the failure,
so the existing tests are extended to close the gap.
Reported-by: Mithun Cy
Author: Michael Paquier
Discussion: https://postgr.es/m/CADq3xVYt6_pO7ZzmjOqPgY9HWsL=kLd-_tNyMtdfjKqEALDyTA@mail.gmail.com
Backpatch-through: 11
75 lines
1.7 KiB
Perl
75 lines
1.7 KiB
Perl
use strict;
|
|
use warnings;
|
|
use TestLib;
|
|
use Test::More tests => 6;
|
|
|
|
use FindBin;
|
|
use lib $FindBin::RealBin;
|
|
|
|
use RewindTest;
|
|
|
|
sub run_test
|
|
{
|
|
my $test_mode = shift;
|
|
|
|
RewindTest::setup_cluster($test_mode, ['-g']);
|
|
RewindTest::start_master();
|
|
|
|
# Create a database in master with a table.
|
|
master_psql('CREATE DATABASE inmaster');
|
|
master_psql('CREATE TABLE inmaster_tab (a int)', 'inmaster');
|
|
|
|
RewindTest::create_standby($test_mode);
|
|
|
|
# Create another database with another table, the creation is
|
|
# replicated to the standby.
|
|
master_psql('CREATE DATABASE beforepromotion');
|
|
master_psql('CREATE TABLE beforepromotion_tab (a int)',
|
|
'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');
|
|
standby_psql('CREATE DATABASE standby_afterpromotion');
|
|
standby_psql('CREATE TABLE standby_promotion_tab (a int)',
|
|
'standby_afterpromotion');
|
|
|
|
# The clusters are now diverged.
|
|
|
|
RewindTest::run_pg_rewind($test_mode);
|
|
|
|
# Check that the correct databases are present after pg_rewind.
|
|
check_query(
|
|
'SELECT datname FROM pg_database ORDER BY 1',
|
|
qq(beforepromotion
|
|
inmaster
|
|
postgres
|
|
standby_afterpromotion
|
|
template0
|
|
template1
|
|
),
|
|
'database names');
|
|
|
|
# Permissions on PGDATA should have group permissions
|
|
SKIP:
|
|
{
|
|
skip "unix-style permissions not supported on Windows", 1
|
|
if ($windows_os);
|
|
|
|
ok(check_mode_recursive($node_master->data_dir(), 0750, 0640),
|
|
'check PGDATA permissions');
|
|
}
|
|
|
|
RewindTest::clean_rewind_test();
|
|
return;
|
|
}
|
|
|
|
# Run the test in both modes.
|
|
run_test('local');
|
|
run_test('remote');
|
|
|
|
exit(0);
|