database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-08-25 20:23:07 +03:00
Code Activity

Replace pgwin32_is_junction() with lstat().

Browse Source 
Now that lstat() reports junction points with S_IFLNK/S_ISLINK(), and
unlink() can unlink them, there is no need for conditional code for
Windows in a few places.  That was expressed by testing for WIN32 or
S_ISLNK, which we can now constant-fold.

The coding around pgwin32_is_junction() was a bit suspect anyway, as we
never checked for errors, and we also know that errors can be spuriously
reported because of transient sharing violations on this OS.  The
lstat()-based code has handling for that.

This also reverts 4fc6b6ee on master only.  That was done because
lstat() didn't previously work for symlinks (junction points), but now
it does.

Tested-by: Andrew Dunstan <andrew@dunslane.net>
Discussion: https://postgr.es/m/CA%2BhUKGLfOOeyZpm5ByVcAt7x5Pn-%3DxGRNCvgiUPVVzjFLtnY0w%40mail.gmail.com
(cherry picked from commit 5fc88c5d53)

Author: Thomas Munro <tmunro@postgresql.org>
Author: Alexandra Wang <alexandra.wang.oss@gmail.com>
This commit is contained in:
Thomas Munro
2022-08-06 12:02:43 +12:00
committed by Andrew Dunstan
parent f2a4a137bb
commit f95ad555de
10 changed files with 2 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/backend/commands/tablespace.c
View File

@@ -807,8 +807,7 @@ destroy_tablespace_directories(Oid tablespaceoid, bool redo)
/*
* Try to remove the symlink. We must however deal with the possibility
* that it's a directory instead of a symlink --- this could happen during
* WAL replay (see TablespaceCreateDbspace), and it is also the case on
* Windows where junction points lstat() as directories.
* WAL replay (see TablespaceCreateDbspace).
*
* Note: in the redo case, we'll return true if this final step fails;
* there's no point in retrying it. Also, ENOENT should provoke no more
@@ -838,7 +837,6 @@ remove_symlink:
linkloc)));
}
}
#ifdef S_ISLNK
else if (S_ISLNK(st.st_mode))
{
if (unlink(linkloc) < 0)
@@ -851,7 +849,6 @@ remove_symlink:
linkloc)));
}
}
#endif
else
{
/* Refuse to remove anything that's not a directory or symlink */
@@ -929,7 +926,6 @@ remove_tablespace_symlink(const char *linkloc)
errmsg("could not remove directory \"%s\": %m",
linkloc)));
}
#ifdef S_ISLNK
else if (S_ISLNK(st.st_mode))
{
if (unlink(linkloc) < 0 && errno != ENOENT)
@@ -938,7 +934,6 @@ remove_tablespace_symlink(const char *linkloc)
errmsg("could not remove symbolic link \"%s\": %m",
linkloc)));
}
#endif
else
{
/* Refuse to remove anything that's not a directory or symlink */