Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
0040fa25
Commit
0040fa25
authored
Apr 21, 2010
by
antirez
Browse files
Merge branch 'master' of github.com:antirez/redis
parents
a08bb01d
122c0498
Changes
2
Show whitespace changes
Inline
Side-by-side
config.h
View file @
0040fa25
...
...
@@ -35,4 +35,9 @@
#define HAVE_KQUEUE 1
#endif
/* test for O_DIRECT */
#ifdef __linux__
#define HAVE_O_DIRECT 1
#endif
#endif
redis.c
View file @
0040fa25
...
...
@@ -54,6 +54,7 @@
#include <inttypes.h>
#include <arpa/inet.h>
#include <sys/stat.h>
#define __USE_GNU
#include <fcntl.h>
#include <sys/time.h>
#include <sys/resource.h>
...
...
@@ -1673,7 +1674,16 @@ static void initServer() {
acceptHandler, NULL) == AE_ERR) oom("creating file event");
if (server.appendonly) {
server.appendfd = open(server.appendfilename,O_WRONLY|O_APPEND|O_CREAT,0644);
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);
if (server.appendfd == -1) {
redisLog(REDIS_WARNING, "Can't open the append-only file: %s",
strerror(errno));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment