Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitabe075d

Browse files
committed
Fix tablespace creation WAL replay to work on Windows.
The code segment that removes the old symlink (if present) wasn't cluedinto the fact that on Windows, symlinks are junction points which haveto be removed with rmdir().Backpatch to 9.0, where the failing code was introduced.MauMau, reviewed by Muhammad Asif Naeem and Amit Kapila
1 parentb203c57 commitabe075d

File tree

1 file changed

+25
-8
lines changed

1 file changed

+25
-8
lines changed

‎src/backend/commands/tablespace.c

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -559,6 +559,7 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid)
559559
{
560560
char*linkloc;
561561
char*location_with_version_dir;
562+
structstatst;
562563

563564
linkloc=psprintf("pg_tblspc/%u",tablespaceoid);
564565
location_with_version_dir=psprintf("%s/%s",location,
@@ -585,8 +586,6 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid)
585586

586587
if (InRecovery)
587588
{
588-
structstatst;
589-
590589
/*
591590
* Our theory for replaying a CREATE is to forcibly drop the target
592591
* subdirectory if present, and then recreate it. This may be more
@@ -620,14 +619,32 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid)
620619
location_with_version_dir)));
621620
}
622621

623-
/* Remove old symlink in recovery, in case it points to the wrong place */
622+
/*
623+
* In recovery, remove old symlink, in case it points to the wrong place.
624+
*
625+
* On Windows, junction points act like directories so we must be able to
626+
* apply rmdir; in general it seems best to make this code work like the
627+
* symlink removal code in destroy_tablespace_directories, except that
628+
* failure to remove is always an ERROR.
629+
*/
624630
if (InRecovery)
625631
{
626-
if (unlink(linkloc)<0&&errno!=ENOENT)
627-
ereport(ERROR,
628-
(errcode_for_file_access(),
629-
errmsg("could not remove symbolic link \"%s\": %m",
630-
linkloc)));
632+
if (lstat(linkloc,&st)==0&&S_ISDIR(st.st_mode))
633+
{
634+
if (rmdir(linkloc)<0)
635+
ereport(ERROR,
636+
(errcode_for_file_access(),
637+
errmsg("could not remove directory \"%s\": %m",
638+
linkloc)));
639+
}
640+
else
641+
{
642+
if (unlink(linkloc)<0&&errno!=ENOENT)
643+
ereport(ERROR,
644+
(errcode_for_file_access(),
645+
errmsg("could not remove symbolic link \"%s\": %m",
646+
linkloc)));
647+
}
631648
}
632649

633650
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp