diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2022-07-27 07:55:12 +0200 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2022-07-27 07:55:12 +0200 |
| commit | ca347f5433ed036ae82cc0939d235b2bda9b77fe (patch) | |
| tree | ce87f00212040686bc9bbccc583b0fc0cc3309d5 /src/backend/access/transam/xlog.c | |
| parent | 968b89257b119ba69e36f4bb0a2a21eed96c2b6c (diff) | |
| download | postgresql-ca347f5433ed036ae82cc0939d235b2bda9b77fe.tar.gz postgresql-ca347f5433ed036ae82cc0939d235b2bda9b77fe.zip | |
Allow "in place" tablespaces.
This is a backpatch to branches 10-14 of the following commits:
7170f2159fb2 Allow "in place" tablespaces.
c6f2f01611d4 Fix pg_basebackup with in-place tablespaces.
f6f0db4d6240 Fix pg_tablespace_location() with in-place tablespaces
7a7cd84893e0 doc: Remove mention to in-place tablespaces for pg_tablespace_location()
5344723755bd Remove unnecessary Windows-specific basebackup code.
In-place tablespaces were introduced as a testing helper mechanism, but
they are going to be used for a bugfix in WAL replay to be backpatched
to all stable branches.
I (Álvaro) had to adjust some code to account for lack of
get_dirent_type() in branches prior to 14.
Author: Thomas Munro <thomas.munro@gmail.com>
Author: Michaël Paquier <michael@paquier.xyz>
Author: Álvaro Herrera <alvherre@alvh.no-ip.org>
Discussion: https://postgr.es/m/20220722081858.omhn2in5zt3g4nek@alvherre.pgsql
Diffstat (limited to 'src/backend/access/transam/xlog.c')
| -rw-r--r-- | src/backend/access/transam/xlog.c | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c index 14bb026b643..484c24b5bd8 100644 --- a/src/backend/access/transam/xlog.c +++ b/src/backend/access/transam/xlog.c @@ -10674,6 +10674,9 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p, int rllen; StringInfoData buflinkpath; char *s = linkpath; +#ifndef WIN32 + struct stat st; +#endif /* Skip special stuff */ if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) @@ -10681,6 +10684,23 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p, snprintf(fullpath, sizeof(fullpath), "pg_tblspc/%s", de->d_name); + /* + * Skip anything that isn't a symlink/junction. For testing only, + * we sometimes use allow_in_place_tablespaces to create + * directories directly under pg_tblspc, which would fail below. + */ +#ifndef WIN32 + if (lstat(fullpath, &st) < 0) + ereport(LOG, + (errcode_for_file_access(), + errmsg("could not stat file \"%s\": %m", + fullpath))); + else if (!S_ISLNK(st.st_mode)) +#else /* WIN32 */ + if (!pgwin32_is_junction(fullpath)) +#endif + continue; + #if defined(HAVE_READLINK) || defined(WIN32) rllen = readlink(fullpath, linkpath, sizeof(linkpath)); if (rllen < 0) |