aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2015-05-29 15:11:36 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2015-05-29 15:11:36 -0400
commit9e79ca326920d25da941fcf2132b33f82b4c40bd (patch)
treef415a397ba3be3d79860037b409113d8aac25a09
parentcb867853a17e4055d58a8639ed4a23652e2ce8e0 (diff)
downloadpostgresql-9e79ca326920d25da941fcf2132b33f82b4c40bd.tar.gz
postgresql-9e79ca326920d25da941fcf2132b33f82b4c40bd.zip
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.
-rw-r--r--src/backend/storage/file/fd.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 7077b75314c..ccf4df15a07 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2418,18 +2418,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);
@@ -2473,12 +2470,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)));