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

Commit077dec8

Browse files
Revert "Skip .DS_Store files in server side utils"
This reverts commitd3fdfdc.Per failure reports from the buildfarm.
1 parentd3fdfdc commit077dec8

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
@@ -2835,7 +2835,7 @@ The commands accepted in replication mode are:
28352835
<para>
28362836
Files other than regular files and directories, such as symbolic
28372837
links (other than for the directories listed above) and special
2838-
deviceand operating systemfiles, are skipped. (Symbolic links
2838+
device files, are skipped. (Symbolic links
28392839
in <filename>pg_tblspc</filename> are maintained.)
28402840
</para>
28412841
</listitem>

‎doc/src/sgml/ref/pg_basebackup.sgml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -832,8 +832,7 @@ PostgreSQL documentation
832832
The backup will include all files in the data directory and tablespaces,
833833
including the configuration files and any additional files placed in the
834834
directory by third parties, except certain temporary files managed by
835-
PostgreSQL and operating system files. But only regular files and
836-
directories are copied, except that
835+
PostgreSQL. But only regular files and directories are copied, except that
837836
symbolic links used for tablespaces are preserved. Symbolic links pointing
838837
to certain directories known to PostgreSQL are copied as empty directories.
839838
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
@@ -374,9 +374,8 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b
374374
<filename>backup_label</filename>,
375375
<filename>tablespace_map</filename>,
376376
<filename>pg_internal.init</filename>,
377-
<filename>postmaster.opts</filename>,
378-
<filename>postmaster.pid</filename> and
379-
<filename>.DS_Store</filename> as well as any file or directory
377+
<filename>postmaster.opts</filename>, and
378+
<filename>postmaster.pid</filename>, as well as any file or directory
380379
beginning with <filename>pgsql_tmp</filename>, are omitted.
381380
</para>
382381
</step>

‎src/backend/replication/basebackup.c

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

1265-
/* Skip macOS system files */
1266-
if (strcmp(de->d_name,".DS_Store")==0)
1267-
continue;
1268-
12691265
/*
12701266
* Check if the postmaster has signaled us to exit, and abort with an
12711267
* 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-
openmy$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.
@@ -151,12 +141,6 @@
151141
ok(!-f"$tempdir/backup/$filename","$filename not copied");
152142
}
153143

154-
# We only test .DS_Store files being skipped on non-macOS systems
155-
if ($Config{osname}ne'darwin')
156-
{
157-
ok(!-f"$tempdir/backup/.DS_Store",".DS_Store not copied");
158-
}
159-
160144
# Unlogged relation forks other than init should not be copied
161145
ok(-f"$tempdir/backup/${baseUnloggedPath}_init",
162146
'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
@@ -338,10 +338,6 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly)
338338
strlen(PG_TEMP_FILES_DIR))==0)
339339
continue;
340340

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

‎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::Moretests=> 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
@@ -749,10 +749,6 @@ isRelDataFile(const char *path)
749749
}
750750
}
751751

752-
/* Skip macOS system files */
753-
if (strstr(path,".DS_Store")!=NULL)
754-
returnFILE_ACTION_NONE;
755-
756752
/*
757753
* The sscanf tests above can match files that have extra characters at
758754
* 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::Moretests=> 5;
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)
[8]ページ先頭
©2009-2025 Movatter.jp