diff options
author | antirez <antirez@gmail.com> | 2010-04-21 10:31:16 +0200 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2010-04-21 10:31:16 +0200 |
commit | 3bb225d66be633c88ba01c6e7a0cebf91837cd13 (patch) | |
tree | a3e4a5792f1b91a5b7fd3ff8c2886e5e973185b2 | |
parent | d6fb4d5396a8822435e50843b4ddc4522cfec070 (diff) | |
download | redis-3bb225d66be633c88ba01c6e7a0cebf91837cd13.tar.gz |
Revert "fsync always now uses O_DIRECT on Linux"
This reverts commit 566c3c7a22c0ec217c40f7a95db2bb83c8cc16c7.
-rw-r--r-- | config.h | 5 | ||||
-rw-r--r-- | redis.c | 11 |
2 files changed, 1 insertions, 15 deletions
@@ -35,9 +35,4 @@ #define HAVE_KQUEUE 1 #endif -/* test for O_DIRECT */ -#ifdef __linux__ -#define HAVE_O_DIRECT 1 -#endif - #endif @@ -1673,16 +1673,7 @@ static void initServer() { acceptHandler, NULL) == AE_ERR) oom("creating file event"); if (server.appendonly) { - int flags = O_WRONLY|O_APPEND|O_CREAT; - -#ifdef HAVE_O_DIRECT - if (server.appendfsync == APPENDFSYNC_ALWAYS) { - flags |= O_DIRECT; - server.appendfsync = APPENDFSYNC_NO; - } -#endif - - server.appendfd = open(server.appendfilename,flags,0644); + server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644); if (server.appendfd == -1) { redisLog(REDIS_WARNING, "Can't open the append-only file: %s", strerror(errno)); |