Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 588f370

Browse files
Revert "Skip .DS_Store files in server side utils"
This reverts commit 76bb6dd. Per failure reports from the buildfarm.
1 parent 76bb6dd commit 588f370

File tree

9 files changed

+4
-46
lines changed

9 files changed

+4
-46
lines changed

doc/src/sgml/protocol.sgml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2795,7 +2795,7 @@ The commands accepted in replication mode are:
27952795
<para>
27962796
Files other than regular files and directories, such as symbolic
27972797
links (other than for the directories listed above) and special
2798-
device and operating system files, are skipped. (Symbolic links
2798+
device files, are skipped. (Symbolic links
27992799
in <filename>pg_tblspc</filename> are maintained.)
28002800
</para>
28012801
</listitem>

doc/src/sgml/ref/pg_basebackup.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -726,8 +726,7 @@ PostgreSQL documentation
726726
The backup will include all files in the data directory and tablespaces,
727727
including the configuration files and any additional files placed in the
728728
directory by third parties, except certain temporary files managed by
729-
PostgreSQL and operating system files. But only regular files and
730-
directories are copied, except that
729+
PostgreSQL. But only regular files and directories are copied, except that
731730
symbolic links used for tablespaces are preserved. Symbolic links pointing
732731
to certain directories known to PostgreSQL are copied as empty directories.
733732
Other symbolic links and special device files are skipped.

doc/src/sgml/ref/pg_rewind.sgml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -311,9 +311,8 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b
311311
<filename>backup_label</filename>,
312312
<filename>tablespace_map</filename>,
313313
<filename>pg_internal.init</filename>,
314-
<filename>postmaster.opts</filename>,
315-
<filename>postmaster.pid</filename> and.
316-
<filename>.DS_Store</filename>.
314+
<filename>postmaster.opts</filename> and
315+
<filename>postmaster.pid</filename>.
317316
</para>
318317
</step>
319318
<step>

src/backend/replication/basebackup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1096,10 +1096,6 @@ sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces,
10961096
strlen(PG_TEMP_FILE_PREFIX)) == 0)
10971097
continue;
10981098

1099-
/* Skip macOS system files */
1100-
if (strcmp(de->d_name, ".DS_Store") == 0)
1101-
continue;
1102-
11031099
/*
11041100
* Check if the postmaster has signaled us to exit, and abort with an
11051101
* error in that case. The error handler further up will call

src/bin/pg_basebackup/t/010_pg_basebackup.pl

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,16 +73,6 @@
7373
close $file;
7474
}
7575

76-
# Test that macOS system files are skipped. Only test on non-macOS systems
77-
# however since creating incorrect .DS_Store files on a macOS system may have
78-
# unintended side effects.
79-
if ($Config{osname} ne 'darwin')
80-
{
81-
open my $file, '>>', "$pgdata/.DS_Store";
82-
print $file "DONOTCOPY";
83-
close $file;
84-
}
85-
8676
# Connect to a database to create global/pg_internal.init. If this is removed
8777
# the test to ensure global/pg_internal.init is not copied will return a false
8878
# positive.
@@ -150,12 +140,6 @@
150140
ok(!-f "$tempdir/backup/$filename", "$filename not copied");
151141
}
152142

153-
# We only test .DS_Store files being skipped on non-macOS systems
154-
if ($Config{osname} ne 'darwin')
155-
{
156-
ok(!-f "$tempdir/backup/.DS_Store", ".DS_Store not copied");
157-
}
158-
159143
# Unlogged relation forks other than init should not be copied
160144
ok(-f "$tempdir/backup/${baseUnloggedPath}_init",
161145
'unlogged init fork in backup');

src/bin/pg_checksums/pg_checksums.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,6 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly)
337337
strlen(PG_TEMP_FILES_DIR)) == 0)
338338
continue;
339339

340-
/* Skip macOS system files */
341-
if (strcmp(de->d_name, ".DS_Store") == 0)
342-
continue;
343-
344340
snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name);
345341
if (lstat(fn, &st) < 0)
346342
{

src/bin/pg_checksums/t/002_actions.pl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
use strict;
55
use warnings;
6-
use Config
76
use PostgresNode;
87
use TestLib;
98
use Test::More tests => 63;
@@ -111,12 +110,6 @@ sub check_relation_corruption
111110
append_to_file "$pgdata/global/pg_internal.init", "foo";
112111
append_to_file "$pgdata/global/pg_internal.init.123", "foo";
113112

114-
# These are non-postgres macOS files, which should be ignored by the scan.
115-
# Only perform this test on non-macOS systems though as creating incorrect
116-
# system files may have side effects on macOS.
117-
append_to_file "$pgdata/global/.DS_Store", "foo"
118-
unless ($Config{osname} eq 'darwin');
119-
120113
# Enable checksums.
121114
command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ],
122115
"checksums successfully enabled in cluster");

src/bin/pg_rewind/filemap.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,10 +742,6 @@ isRelDataFile(const char *path)
742742
}
743743
}
744744

745-
/* Skip macOS system files */
746-
if (strstr(path, ".DS_Store") != NULL)
747-
return FILE_ACTION_NONE;
748-
749745
/*
750746
* The sscanf tests above can match files that have extra characters at
751747
* the end. To eliminate such cases, cross-check that GetRelationPath

src/bin/pg_rewind/t/003_extrafiles.pl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
use strict;
44
use warnings;
5-
use Config;
65
use TestLib;
76
use Test::More tests => 4;
87

@@ -45,10 +44,6 @@ sub run_test
4544
append_to_file
4645
"$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file3",
4746
"in standby3";
48-
# Skip testing .DS_Store files on macOS to avoid risk of side effects
49-
append_to_file
50-
"$test_standby_datadir/tst_standby_dir/.DS_Store",
51-
"macOS system file" unless ($Config{osname} eq 'darwin');
5247

5348
mkdir "$test_master_datadir/tst_master_dir";
5449
append_to_file "$test_master_datadir/tst_master_dir/master_file1",

0 commit comments

Comments
 (0)