zhuyijun/read-redis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fsync always now uses O_DIRECT on Linux"

Browse Source 
This reverts commit 566c3c7a22.
This commit is contained in:
antirez 2010-04-21 10:31:16 +02:00
parent d6fb4d5396
commit 3bb225d66b
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config.h
View File

@ -35,9 +35,4 @@
#define HAVE_KQUEUE 1 #define HAVE_KQUEUE 1
#endif #endif
/* test for O_DIRECT */
#ifdef __linux__
#define HAVE_O_DIRECT 1
#endif
#endif #endif

11
redis.c
View File

@ -1673,16 +1673,7 @@ static void initServer() {
acceptHandler, NULL) == AE_ERR) oom("creating file event"); acceptHandler, NULL) == AE_ERR) oom("creating file event");
if (server.appendonly) { if (server.appendonly) {
int flags = O_WRONLY|O_APPEND|O_CREAT; server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644);
#ifdef HAVE_O_DIRECT
if (server.appendfsync == APPENDFSYNC_ALWAYS) {
flags |= O_DIRECT;
server.appendfsync = APPENDFSYNC_NO;
}
#endif
server.appendfd = open(server.appendfilename,flags,0644);
if (server.appendfd == -1) { if (server.appendfd == -1) {
redisLog(REDIS_WARNING, "Can't open the append-only file: %s", redisLog(REDIS_WARNING, "Can't open the append-only file: %s",
strerror(errno)); strerror(errno));