From: Daniel Gustafsson Date: Tue, 13 Feb 2024 13:09:52 +0000 (+0100) Subject: Revert "Skip .DS_Store files in server side utils" X-Git-Tag: REL_14_12~76 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99cd749ce267fd9c0f6461b282f84f65ed9d8535;p=thirdparty%2Fpostgresql.git Revert "Skip .DS_Store files in server side utils" This reverts commit aeee173d229232f94acc61e7bfe81d40f56e478e. Per failure reports from the buildfarm. --- diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml index ba605059fc2..a23a1033632 100644 --- a/doc/src/sgml/protocol.sgml +++ b/doc/src/sgml/protocol.sgml @@ -2842,7 +2842,7 @@ The commands accepted in replication mode are: Files other than regular files and directories, such as symbolic links (other than for the directories listed above) and special - device and operating system files, are skipped. (Symbolic links + device files, are skipped. (Symbolic links in pg_tblspc are maintained.) diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml index e1d24f805ed..9e6807b4574 100644 --- a/doc/src/sgml/ref/pg_basebackup.sgml +++ b/doc/src/sgml/ref/pg_basebackup.sgml @@ -832,8 +832,7 @@ PostgreSQL documentation The backup will include all files in the data directory and tablespaces, including the configuration files and any additional files placed in the directory by third parties, except certain temporary files managed by - PostgreSQL and operating system files. But only regular files and - directories are copied, except that + PostgreSQL. But only regular files and directories are copied, except that symbolic links used for tablespaces are preserved. Symbolic links pointing to certain directories known to PostgreSQL are copied as empty directories. Other symbolic links and special device files are skipped. diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml index 2f431302495..47c55492301 100644 --- a/doc/src/sgml/ref/pg_rewind.sgml +++ b/doc/src/sgml/ref/pg_rewind.sgml @@ -374,9 +374,8 @@ GRANT EXECUTE ON function pg_catalog.pg_read_binary_file(text, bigint, bigint, b backup_label, tablespace_map, pg_internal.init, - postmaster.opts, - postmaster.pid and - .DS_Store as well as any file or directory + postmaster.opts, and + postmaster.pid, as well as any file or directory beginning with pgsql_tmp, are omitted. diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c index 7ed82a76ff8..d142cc21319 100644 --- a/src/backend/replication/basebackup.c +++ b/src/backend/replication/basebackup.c @@ -1272,10 +1272,6 @@ sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces, strlen(PG_TEMP_FILE_PREFIX)) == 0) continue; - /* Skip macOS system files */ - if (strcmp(de->d_name, ".DS_Store") == 0) - continue; - /* * Check if the postmaster has signaled us to exit, and abort with an * error in that case. The error handler further up will call diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl index 43d18fe4ccf..e23ac607aae 100644 --- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl +++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl @@ -76,16 +76,6 @@ foreach my $filename ( close $file; } -# Test that macOS system files are skipped. Only test on non-macOS systems -# however since creating incorrect .DS_Store files on a macOS system may have -# unintended side effects. -if ($Config{osname} ne 'darwin') -{ - open my $file, '>>', "$pgdata/.DS_Store"; - print $file "DONOTCOPY"; - close $file; -} - # Connect to a database to create global/pg_internal.init. If this is removed # the test to ensure global/pg_internal.init is not copied will return a false # positive. @@ -154,12 +144,6 @@ foreach my $filename ( ok(!-f "$tempdir/backup/$filename", "$filename not copied"); } -# We only test .DS_Store files being skipped on non-macOS systems -if ($Config{osname} ne 'darwin') -{ - ok(!-f "$tempdir/backup/.DS_Store", ".DS_Store not copied"); -} - # Unlogged relation forks other than init should not be copied ok(-f "$tempdir/backup/${baseUnloggedPath}_init", 'unlogged init fork in backup'); diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index b97d0f32903..831cf42d3ad 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -338,10 +338,6 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly) strlen(PG_TEMP_FILES_DIR)) == 0) continue; - /* Skip macOS system files */ - if (strcmp(de->d_name, ".DS_Store") == 0) - continue; - snprintf(fn, sizeof(fn), "%s/%s", path, de->d_name); if (lstat(fn, &st) < 0) { diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index a8ced3b4bed..761f7ab53b6 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -6,7 +6,6 @@ use strict; use warnings; -use Config; use PostgresNode; use TestLib; @@ -115,12 +114,6 @@ append_to_file "$pgdata/global/pgsql_tmp/1.1", "foo"; append_to_file "$pgdata/global/pg_internal.init", "foo"; append_to_file "$pgdata/global/pg_internal.init.123", "foo"; -# These are non-postgres macOS files, which should be ignored by the scan. -# Only perform this test on non-macOS systems though as creating incorrect -# system files may have side effects on macOS. -append_to_file "$pgdata/global/.DS_Store", "foo" - unless ($Config{osname} eq 'darwin'); - # Enable checksums. command_ok([ 'pg_checksums', '--enable', '--no-sync', '-D', $pgdata ], "checksums successfully enabled in cluster"); diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c index f3ce4f68288..2618b4c957b 100644 --- a/src/bin/pg_rewind/filemap.c +++ b/src/bin/pg_rewind/filemap.c @@ -648,10 +648,6 @@ decide_file_action(file_entry_t *entry) if (strcmp(path, "global/pg_control") == 0) return FILE_ACTION_NONE; - /* Skip macOS system files */ - if (strstr(path, ".DS_Store") != NULL) - return FILE_ACTION_NONE; - /* * Remove all files matching the exclusion filters in the target. */ diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl index be60ecaaee4..baea3836b6f 100644 --- a/src/bin/pg_rewind/t/003_extrafiles.pl +++ b/src/bin/pg_rewind/t/003_extrafiles.pl @@ -5,7 +5,6 @@ use strict; use warnings; -use Config; use TestLib; use Test::More tests => 5; @@ -54,10 +53,6 @@ sub run_test append_to_file "$test_standby_datadir/tst_standby_dir/standby_subdir/standby_file4", "in standby4"; - # Skip testing .DS_Store files on macOS to avoid risk of side effects - append_to_file - "$test_standby_datadir/tst_standby_dir/.DS_Store", - "macOS system file" unless ($Config{osname} eq 'darwin'); mkdir "$test_primary_datadir/tst_primary_dir"; append_to_file "$test_primary_datadir/tst_primary_dir/primary_file1",