Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 543d8c2

Browse files
committed
Clean up assorted messiness around AllocateDir() usage.
This patch fixes a couple of low-probability bugs that could lead to reporting an irrelevant errno value (and hence possibly a wrong SQLSTATE) concerning directory-open or file-open failures. It also fixes places where we took shortcuts in reporting such errors, either by using elog instead of ereport or by using ereport but forgetting to specify an errcode. And it eliminates a lot of just plain redundant error-handling code. In service of all this, export fd.c's formerly-static function ReadDirExtended, so that external callers can make use of the coding pattern dir = AllocateDir(path); while ((de = ReadDirExtended(dir, path, LOG)) != NULL) if they'd like to treat directory-open failures as mere LOG conditions rather than errors. Also fix FreeDir to be a no-op if we reach it with dir == NULL, as such a coding pattern would cause. Then, remove code at many call sites that was throwing an error or log message for AllocateDir failure, as ReadDir or ReadDirExtended can handle that job just fine. Aside from being a net code savings, this gets rid of a lot of not-quite-up-to-snuff reports, as mentioned above. (In some places these changes result in replacing a custom error message such as "could not open tablespace directory" with more generic wording "could not open directory", but it was agreed that the custom wording buys little as long as we report the directory name.) In some other call sites where we can't just remove code, change the error reports to be fully project-style-compliant. Also reorder code in restoreTwoPhaseData that was acquiring a lock between AllocateDir and ReadDir; in the unlikely but surely not impossible case that LWLockAcquire changes errno, AllocateDir failures would be misreported. There is no great value in opening the directory before acquiring TwoPhaseStateLock, so just do it in the other order. Also fix CheckXLogRemoved to guarantee that it preserves errno, as quite a number of call sites are implicitly assuming. (Again, it's unlikely but I think not impossible that errno could change during a SpinLockAcquire. If so, this function was broken for its own purposes as well as breaking callers.) And change a few places that were using not-per-project-style messages, such as "could not read directory" when "could not open directory" is more correct. Back-patch the exporting of ReadDirExtended, in case we have occasion to back-patch some fix that makes use of it; it's not needed right now but surely making it global is pretty harmless. Also back-patch the restoreTwoPhaseData and CheckXLogRemoved fixes. The rest of this is essentially cosmetic and need not get back-patched. Michael Paquier, with a bit of additional work by me Discussion: https://postgr.es/m/CAB7nPqRpOCxjiirHmebEFhXVTK7V5Jvw4bz82p7Oimtsm3TyZA@mail.gmail.com
1 parent c122002 commit 543d8c2

File tree

3 files changed

+34
-8
lines changed

3 files changed

+34
-8
lines changed

src/backend/access/transam/xlog.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3597,10 +3597,16 @@ PreallocXlogFiles(XLogRecPtr endptr)
35973597
* existed while the server has been running, as this function always
35983598
* succeeds if no WAL segments have been removed since startup.
35993599
* 'tli' is only used in the error message.
3600+
*
3601+
* Note: this function guarantees to keep errno unchanged on return.
3602+
* This supports callers that use this to possibly deliver a better
3603+
* error message about a missing file, while still being able to throw
3604+
* a normal file-access error afterwards, if this does return.
36003605
*/
36013606
void
36023607
CheckXLogRemoved(XLogSegNo segno, TimeLineID tli)
36033608
{
3609+
int save_errno = errno;
36043610
XLogSegNo lastRemovedSegNo;
36053611

36063612
SpinLockAcquire(&XLogCtl->info_lck);
@@ -3612,11 +3618,13 @@ CheckXLogRemoved(XLogSegNo segno, TimeLineID tli)
36123618
char filename[MAXFNAMELEN];
36133619

36143620
XLogFileName(filename, tli, segno);
3621+
errno = save_errno;
36153622
ereport(ERROR,
36163623
(errcode_for_file_access(),
36173624
errmsg("requested WAL segment %s has already been removed",
36183625
filename)));
36193626
}
3627+
errno = save_errno;
36203628
}
36213629

36223630
/*

src/backend/storage/file/fd.c

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,6 @@ static int FileAccess(File file);
304304
static File OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError);
305305
static bool reserveAllocatedDesc(void);
306306
static int FreeDesc(AllocateDesc *desc);
307-
static struct dirent *ReadDirExtended(DIR *dir, const char *dirname, int elevel);
308307

309308
static void AtProcExit_Files(int code, Datum arg);
310309
static void CleanupTempFiles(bool isProcExit);
@@ -2284,6 +2283,10 @@ CloseTransientFile(int fd)
22842283
* necessary to open the directory, and with closing it after an elog.
22852284
* When done, call FreeDir rather than closedir.
22862285
*
2286+
* Returns NULL, with errno set, on failure. Note that failure detection
2287+
* is commonly left to the following call of ReadDir or ReadDirExtended;
2288+
* see the comments for ReadDir.
2289+
*
22872290
* Ideally this should be the *only* direct call of opendir() in the backend.
22882291
*/
22892292
DIR *
@@ -2346,8 +2349,8 @@ AllocateDir(const char *dirname)
23462349
* FreeDir(dir);
23472350
*
23482351
* since a NULL dir parameter is taken as indicating AllocateDir failed.
2349-
* (Make sure errno hasn't been changed since AllocateDir if you use this
2350-
* shortcut.)
2352+
* (Make sure errno isn't changed between AllocateDir and ReadDir if you
2353+
* use this shortcut.)
23512354
*
23522355
* The pathname passed to AllocateDir must be passed to this routine too,
23532356
* but it is only used for error reporting.
@@ -2359,10 +2362,15 @@ ReadDir(DIR *dir, const char *dirname)
23592362
}
23602363

23612364
/*
2362-
* Alternate version that allows caller to specify the elevel for any
2363-
* error report. If elevel < ERROR, returns NULL on any error.
2365+
* Alternate version of ReadDir that allows caller to specify the elevel
2366+
* for any error report (whether it's reporting an initial failure of
2367+
* AllocateDir or a subsequent directory read failure).
2368+
*
2369+
* If elevel < ERROR, returns NULL after any error. With the normal coding
2370+
* pattern, this will result in falling out of the loop immediately as
2371+
* though the directory contained no (more) entries.
23642372
*/
2365-
static struct dirent *
2373+
struct dirent *
23662374
ReadDirExtended(DIR *dir, const char *dirname, int elevel)
23672375
{
23682376
struct dirent *dent;
@@ -2392,14 +2400,22 @@ ReadDirExtended(DIR *dir, const char *dirname, int elevel)
23922400
/*
23932401
* Close a directory opened with AllocateDir.
23942402
*
2395-
* Note we do not check closedir's return value --- it is up to the caller
2396-
* to handle close errors.
2403+
* Returns closedir's return value (with errno set if it's not 0).
2404+
* Note we do not check the return value --- it is up to the caller
2405+
* to handle close errors if wanted.
2406+
*
2407+
* Does nothing if dir == NULL; we assume that directory open failure was
2408+
* already reported if desired.
23972409
*/
23982410
int
23992411
FreeDir(DIR *dir)
24002412
{
24012413
int i;
24022414

2415+
/* Nothing to do if AllocateDir failed */
2416+
if (dir == NULL)
2417+
return 0;
2418+
24032419
DO_DB(elog(LOG, "FreeDir: Allocated %d", numAllocatedDescs));
24042420

24052421
/* Remove dir from list of allocated dirs, if it's present */

src/include/storage/fd.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,8 @@ extern int ClosePipeStream(FILE *file);
9191
/* Operations to allow use of the <dirent.h> library routines */
9292
extern DIR *AllocateDir(const char *dirname);
9393
extern struct dirent *ReadDir(DIR *dir, const char *dirname);
94+
extern struct dirent *ReadDirExtended(DIR *dir, const char *dirname,
95+
int elevel);
9496
extern int FreeDir(DIR *dir);
9597

9698
/* Operations to allow use of a plain kernel FD, with automatic cleanup */

0 commit comments

Comments
 (0)