Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite183530

Browse files
committed
Fix RecursiveCopy.pm to cope with disappearing files.
When copying from an active database tree, it's possible for files to bedeleted after we see them in a readdir() scan but before we can open them.(Once we've got a file open, we don't expect any further errors from itgetting unlinked, though.) Tweak RecursiveCopy so it can cope with thiscase, so as to avoid irreproducible test failures.Back-patch to 9.6 where this code was added. In v10 and HEAD, alsoremove unused "use RecursiveCopy" in one recovery test script.Michael Paquier and Tom LaneDiscussion:https://postgr.es/m/24621.1504924323@sss.pgh.pa.us
1 parent57e1c00 commite183530

File tree

2 files changed

+45
-20
lines changed

2 files changed

+45
-20
lines changed

‎src/test/perl/RecursiveCopy.pm

Lines changed: 45 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,17 @@ use File::Copy;
2929
=head2copypath($from, $to, %params)
3030
3131
Recursively copy all files and directories from $from to $to.
32+
Does not preserve file metadata (e.g., permissions).
3233
3334
Only regular files and subdirectories are copied. Trying to copy other types
3435
of directory entries raises an exception.
3536
3637
Raises an exception if a file would be overwritten, the source directory can't
37-
be read, or any I/O operation fails. Always returns true.
38+
be read, or any I/O operation fails. However, we silently ignore ENOENT on
39+
open, because when copying from a live database it's possible for a file/dir
40+
to be deleted after we see its directory entry but before we can open it.
41+
42+
Always returns true.
3843
3944
If theB<filterfn> parameter is given, it must be a subroutine reference.
4045
This subroutine will be called for each entry in the source directory with its
@@ -74,6 +79,9 @@ sub copypath
7479
$filterfn =sub {return 1; };
7580
}
7681

82+
# Complain if original path is bogus, because _copypath_recurse won't.
83+
die"\"$base_src_dir\" does not exist"if !-e$base_src_dir;
84+
7785
# Start recursive copy from current directory
7886
return _copypath_recurse($base_src_dir,$base_dest_dir,"",$filterfn);
7987
}
@@ -89,12 +97,8 @@ sub _copypath_recurse
8997
return 1unless &$filterfn($curr_path);
9098

9199
# Check for symlink -- needed only on source dir
92-
die"Cannot operate on symlinks"if-l$srcpath;
93-
94-
# Can't handle symlinks or other weird things
95-
die"Source path\"$srcpath\" is not a regular file or directory"
96-
unless-f$srcpath
97-
or-d$srcpath;
100+
# (note: this will fall through quietly if file is already gone)
101+
die"Cannot operate on symlink\"$srcpath\""if-l$srcpath;
98102

99103
# Abort if destination path already exists. Should we allow directories
100104
# to exist already?
@@ -104,25 +108,47 @@ sub _copypath_recurse
104108
# same name and we're done.
105109
if (-f$srcpath)
106110
{
107-
copy($srcpath,$destpath)
111+
my$fh;
112+
unless (open($fh,'<',$srcpath))
113+
{
114+
return 1if ($!{ENOENT});
115+
die"open($srcpath) failed:$!";
116+
}
117+
copy($fh,$destpath)
108118
ordie"copy$srcpath ->$destpath failed:$!";
119+
close$fh;
109120
return 1;
110121
}
111122

112-
# Otherwise this is directory: create it on dest and recurse onto it.
113-
mkdir($destpath)ordie"mkdir($destpath) failed:$!";
114-
115-
opendir(my$directory,$srcpath)ordie"could not opendir($srcpath):$!";
116-
while (my$entry =readdir($directory))
123+
# If it's a directory, create it on dest and recurse into it.
124+
if (-d$srcpath)
117125
{
118-
nextif ($entryeq'.'or$entryeq'..');
119-
_copypath_recurse($base_src_dir,$base_dest_dir,
120-
$curr_patheq'' ?$entry :"$curr_path/$entry",$filterfn)
121-
ordie"copypath$srcpath/$entry ->$destpath/$entry failed";
126+
my$directory;
127+
unless (opendir($directory,$srcpath))
128+
{
129+
return 1if ($!{ENOENT});
130+
die"opendir($srcpath) failed:$!";
131+
}
132+
133+
mkdir($destpath)ordie"mkdir($destpath) failed:$!";
134+
135+
while (my$entry =readdir($directory))
136+
{
137+
nextif ($entryeq'.'or$entryeq'..');
138+
_copypath_recurse($base_src_dir,$base_dest_dir,
139+
$curr_patheq'' ?$entry :"$curr_path/$entry",$filterfn)
140+
ordie"copypath$srcpath/$entry ->$destpath/$entry failed";
141+
}
142+
143+
closedir($directory);
144+
return 1;
122145
}
123-
closedir($directory);
124146

125-
return 1;
147+
# If it disappeared from sight, that's OK.
148+
return 1if !-e$srcpath;
149+
150+
# Else it's some weird file type; complain.
151+
die"Source path\"$srcpath\" is not a regular file or directory";
126152
}
127153

128154
1;

‎src/test/recovery/t/010_logical_decoding_timelines.pl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
use PostgresNode;
2525
use TestLib;
2626
use Test::Moretests=> 13;
27-
use RecursiveCopy;
2827
use File::Copy;
2928
use IPC::Run ();
3029
use Scalar::Utilqw(blessed);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp