From bf2f20c086a04e7705a4e856d6cc9ebda3eb0017 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Fri, 29 May 2015 15:11:36 -0400 Subject: [PATCH] Remove special cases for ETXTBSY from new fsync'ing logic. The argument that this is a sufficiently-expected case to be silently ignored seems pretty thin. Andres had brought it up back when we were still considering that most fsync failures should be hard errors, and it probably would be legit not to fail hard for ETXTBSY --- but the same is true for EROFS and other cases, which is why we gave up on hard failures. ETXTBSY is surely not a normal case, so logging the failure seems fine from here. --- src/backend/storage/file/fd.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 7aaed00839c..a8db0a47191 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -2216,18 +2216,15 @@ pre_sync_fname(const char *fname, bool isdir, int elevel) { if (errno == EACCES || (isdir && errno == EISDIR)) return; - -#ifdef ETXTBSY - if (errno == ETXTBSY) - return; -#endif - ereport(elevel, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", fname))); return; } + /* + * We ignore errors from pg_flush_data() because this is only a hint. + */ (void) pg_flush_data(fd, 0, 0); (void) close(fd); @@ -2271,12 +2268,6 @@ fsync_fname_ext(const char *fname, bool isdir, int elevel) { if (errno == EACCES || (isdir && errno == EISDIR)) return; - -#ifdef ETXTBSY - if (errno == ETXTBSY) - return; -#endif - ereport(elevel, (errcode_for_file_access(), errmsg("could not open file \"%s\": %m", fname)));