diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2024-07-08 13:46:21 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2024-07-08 13:53:54 -0400 |
| commit | 4b719e15beed7ceb49d0bd4047aa08001c7fbcf6 (patch) | |
| tree | bd28ebb8b62ffb7315d99e3b00a580bd933b084a /src | |
| parent | b7d3be64e4378ad85e180838912c774825b02b8c (diff) | |
| download | postgresql-4b719e15beed7ceb49d0bd4047aa08001c7fbcf6.tar.gz postgresql-4b719e15beed7ceb49d0bd4047aa08001c7fbcf6.zip | |
Symlink pg_replslot robustly on Windows in pg_basebackup test
This reverts commit e9f15bc9. Instead of a hacky solution that didn't
work on Windows, we avoid trying to move the directory possibly across
drives, and instead remove it and recreate it in the new location.
Discussion: https://postgr.es/m/20240707070243.sb77kp4ubowauctz@awork3.anarazel.de
Backpatch to release 14 like the previous patch.
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/pg_basebackup/t/010_pg_basebackup.pl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 476db8ad68f..cc04417a3fe 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -234,13 +234,13 @@ chmod_recursive("$pgdata", 0750, 0640); # Create a temporary directory in the system location. my $sys_tempdir = TestLib::tempdir_short; -# On Windows use the short location to avoid path length issues. -# Elsewhere use $tempdir to avoid file system boundary issues with moving. -my $tmploc = $windows_os ? $sys_tempdir : $tempdir; - -rename("$pgdata/pg_replslot", "$tmploc/pg_replslot") - or BAIL_OUT "could not move $pgdata/pg_replslot"; -dir_symlink("$tmploc/pg_replslot", "$pgdata/pg_replslot") +# pg_replslot should be empty. We remove it and recreate it in $sys_tempdir +# before symlinking, in order to avoid possibly trying to move things across +# drives. +rmdir("$pgdata/pg_replslot") + or BAIL_OUT "could not remove $pgdata/pg_replslot"; +mkdir("$sys_tempdir/pg_replslot"); # if this fails the symlink will fail +dir_symlink("$sys_tempdir/pg_replslot", "$pgdata/pg_replslot") or BAIL_OUT "could not symlink to $pgdata/pg_replslot"; $node->start; |