database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

Be more conservative about removing tablespace "symlinks".

Browse Source 
Don't apply rmtree(), which will gleefully remove an entire subtree,
and don't even apply unlink() unless it's symlink or a directory,
the only things that we expect to find.

Amit Kapila, with minor tweaks by me, per extensive discussions
involving Andrew Dunstan, Fujii Masao, and Heikki Linnakangas,
at least some of whom also reviewed the code.
This commit is contained in:
Robert Haas
2015-06-26 15:53:13 -04:00
parent c66bc72e8a
commit 8f15f74a44
3 changed files with 69 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/backend/access/transam/xlog.c
View File

@ -38,6 +38,7 @@
#include "catalog/catversion.h"
#include "catalog/pg_control.h"
#include "catalog/pg_database.h"
#include "commands/tablespace.h"
#include "miscadmin.h"
#include "pgstat.h"
#include "postmaster/bgwriter.h"
@ -6074,7 +6075,6 @@ StartupXLOG(void)
if (read_tablespace_map(&tablespaces))
{
ListCell *lc;
struct stat st;
foreach(lc, tablespaces)
{
@ -6085,27 +6085,9 @@ StartupXLOG(void)
/*
* Remove the existing symlink if any and Create the symlink
* under PGDATA. We need to use rmtree instead of rmdir as
* the link location might contain directories or files
* corresponding to the actual path. Some tar utilities do
* things that way while extracting symlinks.
* under PGDATA.
*/
if (lstat(linkloc, &st) == 0 && S_ISDIR(st.st_mode))
{
if (!rmtree(linkloc, true))
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not remove directory \"%s\": %m",
linkloc)));
}
else
{
if (unlink(linkloc) < 0 && errno != ENOENT)
ereport(ERROR,
(errcode_for_file_access(),
errmsg("could not remove symbolic link \"%s\": %m",
linkloc)));
}
remove_tablespace_symlink(linkloc);
if (symlink(ti->path, linkloc) < 0)
ereport(ERROR,