diff options
| -rw-r--r-- | src/bin/pg_checksums/pg_checksums.c | 47 | ||||
| -rw-r--r-- | src/bin/pg_checksums/t/002_actions.pl | 9 |
2 files changed, 54 insertions, 2 deletions
diff --git a/src/bin/pg_checksums/pg_checksums.c b/src/bin/pg_checksums/pg_checksums.c index 9bd0bf947f7..eb179500960 100644 --- a/src/bin/pg_checksums/pg_checksums.c +++ b/src/bin/pg_checksums/pg_checksums.c @@ -385,7 +385,52 @@ scan_directory(const char *basedir, const char *subdir, bool sizeonly) #else else if (S_ISDIR(st.st_mode) || pgwin32_is_junction(fn)) #endif - dirsize += scan_directory(path, de->d_name, sizeonly); + { + /* + * If going through the entries of pg_tblspc, we assume to operate + * on tablespace locations where only TABLESPACE_VERSION_DIRECTORY + * is valid, resolving the linked locations and dive into them + * directly. + */ + if (strncmp("pg_tblspc", subdir, strlen("pg_tblspc")) == 0) + { + char tblspc_path[MAXPGPATH]; + struct stat tblspc_st; + + /* + * Resolve tablespace location path and check whether + * TABLESPACE_VERSION_DIRECTORY exists. Not finding a valid + * location is unexpected, since there should be no orphaned + * links and no links pointing to something else than a + * directory. + */ + snprintf(tblspc_path, sizeof(tblspc_path), "%s/%s/%s", + path, de->d_name, TABLESPACE_VERSION_DIRECTORY); + + if (lstat(tblspc_path, &tblspc_st) < 0) + { + pg_log_error("could not stat file \"%s\": %m", + tblspc_path); + exit(1); + } + + /* + * Move backwards once as the scan needs to happen for the + * contents of TABLESPACE_VERSION_DIRECTORY. + */ + snprintf(tblspc_path, sizeof(tblspc_path), "%s/%s", + path, de->d_name); + + /* Looks like a valid tablespace location */ + dirsize += scan_directory(tblspc_path, + TABLESPACE_VERSION_DIRECTORY, + sizeonly); + } + else + { + dirsize += scan_directory(path, de->d_name, sizeonly); + } + } } closedir(dir); return dirsize; diff --git a/src/bin/pg_checksums/t/002_actions.pl b/src/bin/pg_checksums/t/002_actions.pl index 83a730ea947..4e4934532a3 100644 --- a/src/bin/pg_checksums/t/002_actions.pl +++ b/src/bin/pg_checksums/t/002_actions.pl @@ -5,7 +5,7 @@ use strict; use warnings; use PostgresNode; use TestLib; -use Test::More tests => 62; +use Test::More tests => 63; # Utility routine to create and check a table with corrupted checksums @@ -217,6 +217,13 @@ sub fail_corrupt # Stop instance for the follow-up checks. $node->stop; +# Create a fake tablespace location that should not be scanned +# when verifying checksums. +mkdir "$tablespace_dir/PG_99_999999991/"; +append_to_file "$tablespace_dir/PG_99_999999991/foo", "123"; +command_ok([ 'pg_checksums', '--check', '-D', $pgdata ], + "succeeds with foreign tablespace"); + # Authorized relation files filled with corrupted data cause the # checksum checks to fail. Make sure to use file names different # than the previous ones. |