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

Commit5406513

Browse files
committed
In pgwin32_open, loop after ERROR_ACCESS_DENIED only if we can't stat.
This fixes a performance problem introduced by commit6d7547c.ERROR_ACCESS_DENIED is returned in some other cases besides thedelete-pending case considered by that commit; notably, if thegiven path names a directory instead of a plain file. In thatcase we'll uselessly loop for 1 second before returning thefailure condition. That slows down some usage scenarios enoughto cause test timeout failures on our Windows buildfarm critters.To fix, try to stat() the file, and sleep/loop only if that fails.It will fail in the delete-pending case, and also in the case wherethe deletion completed before we could stat(), so we have the caseswhere we want to loop covered. In the directory case, the stat()should succeed, letting us exit without a wait.One case where we'll still wait uselessly is if the access-deniedproblem pertains to a directory in the given pathname. But we don'texpect that to happen in any performance-critical code path.There might be room to refine this further, but I'll push it nowin hopes of making the buildfarm green again.Back-patch, like the preceding commit.Alexander Lakhin and Tom LaneDiscussion:https://postgr.es/m/23073.1576626626@sss.pgh.pa.us
1 parent4376fdb commit5406513

File tree

1 file changed

+23
-7
lines changed

1 file changed

+23
-7
lines changed

‎src/port/open.c

Lines changed: 23 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include<fcntl.h>
2323
#include<assert.h>
24+
#include<sys/stat.h>
2425

2526

2627
staticint
@@ -137,18 +138,33 @@ pgwin32_open(const char *fileName, int fileFlags,...)
137138
}
138139

139140
/*
140-
* ERROR_ACCESS_DENIED can be returned if the file is deleted but not
141-
* yet gone (Windows NT status code is STATUS_DELETE_PENDING). Wait a
142-
* bit and try again, giving up after 1 second (since this condition
143-
* should never persist very long).
141+
* ERROR_ACCESS_DENIED is returned if the file is deleted but not yet
142+
* gone (Windows NT status code is STATUS_DELETE_PENDING). In that
143+
* case we want to wait a bit and try again, giving up after 1 second
144+
* (since this condition should never persist very long). However,
145+
* there are other commonly-hit cases that return ERROR_ACCESS_DENIED,
146+
* so care is needed. In particular that happens if we try to open a
147+
* directory, or of course if there's an actual file-permissions
148+
* problem. To distinguish these cases, try a stat(). In the
149+
* delete-pending case, it will either also get STATUS_DELETE_PENDING,
150+
* or it will see the file as gone and fail with ENOENT. In other
151+
* cases it will usually succeed. The only somewhat-likely case where
152+
* this coding will uselessly wait is if there's a permissions problem
153+
* with a containing directory, which we hope will never happen in any
154+
* performance-critical code paths.
144155
*/
145156
if (err==ERROR_ACCESS_DENIED)
146157
{
147158
if (loops<10)
148159
{
149-
pg_usleep(100000);
150-
loops++;
151-
continue;
160+
structstatst;
161+
162+
if (stat(fileName,&st)!=0)
163+
{
164+
pg_usleep(100000);
165+
loops++;
166+
continue;
167+
}
152168
}
153169
}
154170

0 commit comments

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