mirror of
https://git.postgresql.org/git/postgresql.git
synced 2024-10-06 15:17:01 +02:00
Fix handling of symlinked pg_stat_tmp and pg_replslot
This was already fixed in HEAD as part of 6ad8ac60
but was not
backpatched.
Also change the way pg_xlog is handled to be the same as the other
directories.
Patch from me with pg_xlog addition from Michael Paquier, test updates
from David Steele.
This commit is contained in:
parent
abdc839985
commit
6d779e05a0
@ -57,6 +57,8 @@ static bool sendFile(char *readfilename, char *tarfilename,
|
|||||||
static void sendFileWithContent(const char *filename, const char *content);
|
static void sendFileWithContent(const char *filename, const char *content);
|
||||||
static void _tarWriteHeader(const char *filename, const char *linktarget,
|
static void _tarWriteHeader(const char *filename, const char *linktarget,
|
||||||
struct stat * statbuf);
|
struct stat * statbuf);
|
||||||
|
static int64 _tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf,
|
||||||
|
bool sizeonly);
|
||||||
static void send_int8_string(StringInfoData *buf, int64 intval);
|
static void send_int8_string(StringInfoData *buf, int64 intval);
|
||||||
static void SendBackupHeader(List *tablespaces);
|
static void SendBackupHeader(List *tablespaces);
|
||||||
static void base_backup_cleanup(int code, Datum arg);
|
static void base_backup_cleanup(int code, Datum arg);
|
||||||
@ -966,9 +968,7 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
|
|||||||
if ((statrelpath != NULL && strcmp(pathbuf, statrelpath) == 0) ||
|
if ((statrelpath != NULL && strcmp(pathbuf, statrelpath) == 0) ||
|
||||||
strncmp(de->d_name, PG_STAT_TMP_DIR, strlen(PG_STAT_TMP_DIR)) == 0)
|
strncmp(de->d_name, PG_STAT_TMP_DIR, strlen(PG_STAT_TMP_DIR)) == 0)
|
||||||
{
|
{
|
||||||
if (!sizeonly)
|
size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
|
||||||
_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
|
|
||||||
size += 512;
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -978,9 +978,7 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
|
|||||||
*/
|
*/
|
||||||
if (strcmp(de->d_name, "pg_replslot") == 0)
|
if (strcmp(de->d_name, "pg_replslot") == 0)
|
||||||
{
|
{
|
||||||
if (!sizeonly)
|
size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
|
||||||
_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
|
|
||||||
size += 512; /* Size of the header just added */
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -990,19 +988,9 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
|
|||||||
* we get permissions right.
|
* we get permissions right.
|
||||||
*/
|
*/
|
||||||
if (strcmp(pathbuf, "./pg_xlog") == 0)
|
if (strcmp(pathbuf, "./pg_xlog") == 0)
|
||||||
{
|
|
||||||
if (!sizeonly)
|
|
||||||
{
|
{
|
||||||
/* If pg_xlog is a symlink, write it as a directory anyway */
|
/* If pg_xlog is a symlink, write it as a directory anyway */
|
||||||
#ifndef WIN32
|
size += _tarWriteDir(pathbuf, basepathlen, &statbuf, sizeonly);
|
||||||
if (S_ISLNK(statbuf.st_mode))
|
|
||||||
#else
|
|
||||||
if (pgwin32_is_junction(pathbuf))
|
|
||||||
#endif
|
|
||||||
statbuf.st_mode = S_IFDIR | S_IRWXU;
|
|
||||||
_tarWriteHeader(pathbuf + basepathlen + 1, NULL, &statbuf);
|
|
||||||
}
|
|
||||||
size += 512; /* Size of the header just added */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Also send archive_status directory (by hackishly reusing
|
* Also send archive_status directory (by hackishly reusing
|
||||||
@ -1244,6 +1232,30 @@ _tarWriteHeader(const char *filename, const char *linktarget,
|
|||||||
pq_putmessage('d', h, 512);
|
pq_putmessage('d', h, 512);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Write tar header for a directory. If the entry in statbuf is a link then
|
||||||
|
* write it as a directory anyway.
|
||||||
|
*/
|
||||||
|
static int64
|
||||||
|
_tarWriteDir(const char *pathbuf, int basepathlen, struct stat * statbuf,
|
||||||
|
bool sizeonly)
|
||||||
|
{
|
||||||
|
if (sizeonly)
|
||||||
|
/* Directory headers are always 512 bytes */
|
||||||
|
return 512;
|
||||||
|
|
||||||
|
/* If symlink, write it as a directory anyway */
|
||||||
|
#ifndef WIN32
|
||||||
|
if (S_ISLNK(statbuf->st_mode))
|
||||||
|
#else
|
||||||
|
if (pgwin32_is_junction(pathbuf))
|
||||||
|
#endif
|
||||||
|
statbuf->st_mode = S_IFDIR | S_IRWXU;
|
||||||
|
|
||||||
|
_tarWriteHeader(pathbuf + basepathlen + 1, NULL, statbuf);
|
||||||
|
return 512;
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Increment the network transfer counter by the given number of bytes,
|
* Increment the network transfer counter by the given number of bytes,
|
||||||
* and sleep if necessary to comply with the requested network transfer
|
* and sleep if necessary to comply with the requested network transfer
|
||||||
|
Loading…
Reference in New Issue
Block a user