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.

diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 487188a791ad5b542c2cddfec7cd07ee911f4e09..197d7d8707a64ba5c025111b4e81f51afd2ad5e0 100644 (file)
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -2647,18 +2647,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) CloseTransientFile(fd);
@@ -2702,12 +2699,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)));

diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 21f628f83d0d88ae1a9e4569d514623a03391188..57f5f89dd94a33cbe41360d56aad4bdaf5321539 100644 (file)
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -627,12 +627,6 @@ pre_sync_fname(const char *fname, bool isdir)
    {
        if (errno == EACCES || (isdir && errno == EISDIR))
            return;
-
-#ifdef ETXTBSY
-       if (errno == ETXTBSY)
-           return;
-#endif
-
        fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
                progname, fname, strerror(errno));
        return;
@@ -692,12 +686,6 @@ fsync_fname_ext(const char *fname, bool isdir)
    {
        if (errno == EACCES || (isdir && errno == EISDIR))
            return;
-
-#ifdef ETXTBSY
-       if (errno == ETXTBSY)
-           return;
-#endif
-
        fprintf(stderr, _("%s: could not open file \"%s\": %s\n"),
                progname, fname, strerror(errno));
        return;