sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-22 00:02:02 -04:00
Code Issues Projects Releases Wiki Activity

pg_combinebackup: Fix PITR comparison test in 002_compare_backups

Browse Source 
The test was creating both the dumps to compare from the same database
on the same node, so it would never detect any mismatches when comparing
the logical dumps of the two servers.

Fixing this issue has revealed that there is a difference in the dumps:
the tablespaces paths are different.  This commit uses compare_text()
with a custom comparison function to erase the difference (slightly
tweaked to be able to work with WIN32 and non-WIN32 paths).  This way,
the non-relevant parts of the tablespace path are ignored from the check
with the basic structure of the query string still compared.

Author: Dagfinn Ilmari Mannsåker
Discussion: https://postgr.es/m/87h67653ns.fsf@wibble.ilmari.org
Backpatch-through: 17
This commit is contained in:
Michael Paquier 2024-12-17 09:24:18 +09:00
parent f5dec4e861
commit 94e7e77a95
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/bin/pg_combinebackup/t/002_compare_backups.pl
View File

@ -2,7 +2,7 @@
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use File::Compare; use File::Compare qw(compare_text);
use PostgreSQL::Test::Cluster; use PostgreSQL::Test::Cluster;
use PostgreSQL::Test::Utils; use PostgreSQL::Test::Utils;
use Test::More; use Test::More;
@ -175,17 +175,23 @@ $pitr1->command_ok(
$pitr1->connstr('postgres'), $pitr1->connstr('postgres'),
], ],
'dump from PITR 1'); 'dump from PITR 1');
$pitr1->command_ok( $pitr2->command_ok(
[ [
'pg_dumpall', '-f', 'pg_dumpall', '-f',
$dump2, '--no-sync', $dump2, '--no-sync',
'--no-unlogged-table-data', '-d', '--no-unlogged-table-data', '-d',
$pitr1->connstr('postgres'), $pitr2->connstr('postgres'),
], ],
'dump from PITR 2'); 'dump from PITR 2');
# Compare the two dumps, there should be no differences. # Compare the two dumps, there should be no differences other than
my $compare_res = compare($dump1, $dump2); # the tablespace paths.
my $compare_res = compare_text(
$dump1, $dump2,
sub {
s{create tablespace .* location .*\btspitr\K[12]}{N}i for @_;
return $_[0] ne $_[1];
});
note($dump1); note($dump1);
note($dump2); note($dump2);
is($compare_res, 0, "dumps are identical"); is($compare_res, 0, "dumps are identical");