database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-03 22:24:49 +03:00
Code

Further refinement of stuck_on_old_timeline recovery test

Browse Source 
TestLib::perl2host can take a file argument as well as a directory
argument, so that code becomes substantially simpler. Also add comments
on why we're using forward slashes, and why we're setting
PERL_BADLANG=0.

Discussion: https://postgr.es/m/e9947bcd-20ee-027c-f0fe-01f736b7e345@dunslane.net
This commit is contained in:
Andrew Dunstan 2021-06-15 15:30:11 -04:00
parent 40ad7ebff6
commit fb3d6b0e1a
No known key found for this signature in database
GPG Key ID: 99FA7FCB59FC3B81
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/test/recovery/t/025_stuck_on_old_timeline.pl
View File

@ -24,11 +24,11 @@ my $node_primary = get_new_node('primary');
# the timeline history file reaches the archive but before any of the WAL files # the timeline history file reaches the archive but before any of the WAL files
# get there. # get there.
$node_primary->init(allows_streaming => 1, has_archiving => 1); $node_primary->init(allows_streaming => 1, has_archiving => 1);
my $perlbin = $^X;
if ($^O eq 'msys') # Note: consistent use of forward slashes here avoids any escaping problems
{ # that arise from use of backslashes. That means we need to double-quote all
$perlbin = TestLib::perl2host(dirname($^X)) . '\\' . basename($^X); # the paths in the archive_command
} my $perlbin = TestLib::perl2host($^X);
$perlbin =~ s!\\!/!g if $TestLib::windows_os; $perlbin =~ s!\\!/!g if $TestLib::windows_os;
my $archivedir_primary = $node_primary->archive_dir; my $archivedir_primary = $node_primary->archive_dir;
$archivedir_primary =~ s!\\!/!g if $TestLib::windows_os; $archivedir_primary =~ s!\\!/!g if $TestLib::windows_os;
@ -36,6 +36,8 @@ $node_primary->append_conf('postgresql.conf', qq(
archive_command = '"$perlbin" "$FindBin::RealBin/cp_history_files" "%p" "$archivedir_primary/%f"' archive_command = '"$perlbin" "$FindBin::RealBin/cp_history_files" "%p" "$archivedir_primary/%f"'
wal_keep_segments=8 wal_keep_segments=8
)); ));
# Make sure that Msys perl doesn't complain about difficulty in setting locale
# when called from the archive_command.
local $ENV{PERL_BADLANG}=0; local $ENV{PERL_BADLANG}=0;
$node_primary->start; $node_primary->start;