diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/file/fd.c | 9 | ||||
| -rw-r--r-- | src/backend/utils/misc/postgresql.conf.sample | 2 | ||||
| -rw-r--r-- | src/include/access/xlogdefs.h | 6 | ||||
| -rw-r--r-- | src/include/port/linux.h | 8 | ||||
| -rw-r--r-- | src/include/port/win32.h | 14 |
5 files changed, 26 insertions, 13 deletions
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index fd5ec7805fd..4f7dc39d638 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -260,12 +260,13 @@ static bool looks_like_temp_rel_name(const char *name); int pg_fsync(int fd) { -#ifndef HAVE_FSYNC_WRITETHROUGH_ONLY - if (sync_method != SYNC_METHOD_FSYNC_WRITETHROUGH) - return pg_fsync_no_writethrough(fd); + /* #if is to skip the sync_method test if there's no need for it */ +#if defined(HAVE_FSYNC_WRITETHROUGH) && !defined(FSYNC_WRITETHROUGH_IS_FSYNC) + if (sync_method == SYNC_METHOD_FSYNC_WRITETHROUGH) + return pg_fsync_writethrough(fd); else #endif - return pg_fsync_writethrough(fd); + return pg_fsync_no_writethrough(fd); } diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 80ee04d30a9..f436b834680 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -157,7 +157,7 @@ #wal_sync_method = fsync # the default is the first option # supported by the operating system: # open_datasync - # fdatasync + # fdatasync (default on Linux) # fsync # fsync_writethrough # open_sync diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h index 18b214e992a..072096ddff5 100644 --- a/src/include/access/xlogdefs.h +++ b/src/include/access/xlogdefs.h @@ -123,12 +123,12 @@ typedef uint32 TimeLineID; #endif #endif -#if defined(OPEN_DATASYNC_FLAG) +#if defined(PLATFORM_DEFAULT_SYNC_METHOD) +#define DEFAULT_SYNC_METHOD PLATFORM_DEFAULT_SYNC_METHOD +#elif defined(OPEN_DATASYNC_FLAG) #define DEFAULT_SYNC_METHOD SYNC_METHOD_OPEN_DSYNC #elif defined(HAVE_FDATASYNC) #define DEFAULT_SYNC_METHOD SYNC_METHOD_FDATASYNC -#elif defined(HAVE_FSYNC_WRITETHROUGH_ONLY) -#define DEFAULT_SYNC_METHOD SYNC_METHOD_FSYNC_WRITETHROUGH #else #define DEFAULT_SYNC_METHOD SYNC_METHOD_FSYNC #endif diff --git a/src/include/port/linux.h b/src/include/port/linux.h index b9498b239df..bcaa42dc4ed 100644 --- a/src/include/port/linux.h +++ b/src/include/port/linux.h @@ -12,3 +12,11 @@ * to have a kernel version test here. */ #define HAVE_LINUX_EIDRM_BUG + +/* + * Set the default wal_sync_method to fdatasync. With recent Linux versions, + * xlogdefs.h's normal rules will prefer open_datasync, which (a) doesn't + * perform better and (b) causes outright failures on ext4 data=journal + * filesystems, because those don't support O_DIRECT. + */ +#define PLATFORM_DEFAULT_SYNC_METHOD SYNC_METHOD_FDATASYNC diff --git a/src/include/port/win32.h b/src/include/port/win32.h index 3417ab5e95c..9c2ae4d60c8 100644 --- a/src/include/port/win32.h +++ b/src/include/port/win32.h @@ -34,14 +34,18 @@ /* Must be here to avoid conflicting with prototype in windows.h */ #define mkdir(a,b) mkdir(a) -#define HAVE_FSYNC_WRITETHROUGH -#define HAVE_FSYNC_WRITETHROUGH_ONLY #define ftruncate(a,b) chsize(a,b) + +/* Windows doesn't have fsync() as such, use _commit() */ +#define fsync(fd) _commit(fd) + /* - * Even though we don't support 'fsync' as a wal_sync_method, - * we do fsync() a few other places where _commit() is just fine. + * For historical reasons, we allow setting wal_sync_method to + * fsync_writethrough on Windows, even though it's really identical to fsync + * (both code paths wind up at _commit()). */ -#define fsync(fd) _commit(fd) +#define HAVE_FSYNC_WRITETHROUGH +#define FSYNC_WRITETHROUGH_IS_FSYNC #define USES_WINSOCK |