Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
48f0308a
Commit
48f0308a
authored
Oct 30, 2009
by
antirez
Browse files
support for appendonly mode no, always, everysec
parent
16f92547
Changes
2
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
48f0308a
...
@@ -190,6 +190,11 @@
...
@@ -190,6 +190,11 @@
#define ZSKIPLIST_MAXLEVEL 32
/* Should be enough for 2^32 elements */
#define ZSKIPLIST_MAXLEVEL 32
/* Should be enough for 2^32 elements */
#define ZSKIPLIST_P 0.25
/* Skiplist P = 1/4 */
#define ZSKIPLIST_P 0.25
/* Skiplist P = 1/4 */
/* Append only defines */
#define APPENDFSYNC_NO 0
#define APPENDFSYNC_ALWAYS 1
#define APPENDFSYNC_EVERYSEC 2
/*================================= Data types ============================== */
/*================================= Data types ============================== */
/* A redis object, that is a type able to hold a string / list / set */
/* A redis object, that is a type able to hold a string / list / set */
...
@@ -262,6 +267,8 @@ struct redisServer {
...
@@ -262,6 +267,8 @@ struct redisServer {
int
dbnum
;
int
dbnum
;
int
daemonize
;
int
daemonize
;
int
appendonly
;
int
appendonly
;
int
appendfsync
;
time_t
lastfsync
;
int
appendfd
;
int
appendfd
;
int
appendseldb
;
int
appendseldb
;
char
*
pidfile
;
char
*
pidfile
;
...
@@ -1029,6 +1036,8 @@ static void initServerConfig() {
...
@@ -1029,6 +1036,8 @@ static void initServerConfig() {
server
.
glueoutputbuf
=
1
;
server
.
glueoutputbuf
=
1
;
server
.
daemonize
=
0
;
server
.
daemonize
=
0
;
server
.
appendonly
=
0
;
server
.
appendonly
=
0
;
server
.
appendfsync
=
APPENDFSYNC_EVERYSEC
;
server
.
lastfsync
=
time
(
NULL
);
server
.
appendfd
=
-
1
;
server
.
appendfd
=
-
1
;
server
.
appendseldb
=
-
1
;
/* Make sure the first time will not match */
server
.
appendseldb
=
-
1
;
/* Make sure the first time will not match */
server
.
pidfile
=
"/var/run/redis.pid"
;
server
.
pidfile
=
"/var/run/redis.pid"
;
...
@@ -1245,6 +1254,17 @@ static void loadServerConfig(char *filename) {
...
@@ -1245,6 +1254,17 @@ static void loadServerConfig(char *filename) {
if
((
server
.
appendonly
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
if
((
server
.
appendonly
=
yesnotoi
(
argv
[
1
]))
==
-
1
)
{
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
err
=
"argument must be 'yes' or 'no'"
;
goto
loaderr
;
}
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"appendfsync"
)
&&
argc
==
2
)
{
if
(
strcasecmp
(
argv
[
1
],
"no"
))
{
server
.
appendfsync
=
APPENDFSYNC_NO
;
}
else
if
(
strcasecmp
(
argv
[
1
],
"always"
))
{
server
.
appendfsync
=
APPENDFSYNC_ALWAYS
;
}
else
if
(
strcasecmp
(
argv
[
1
],
"everysec"
))
{
server
.
appendfsync
=
APPENDFSYNC_EVERYSEC
;
}
else
{
err
=
"argument must be 'no', 'always' or 'everysec'"
;
goto
loaderr
;
}
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"requirepass"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"requirepass"
)
&&
argc
==
2
)
{
server
.
requirepass
=
zstrdup
(
argv
[
1
]);
server
.
requirepass
=
zstrdup
(
argv
[
1
]);
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"pidfile"
)
&&
argc
==
2
)
{
}
else
if
(
!
strcasecmp
(
argv
[
0
],
"pidfile"
)
&&
argc
==
2
)
{
...
@@ -1651,6 +1671,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
...
@@ -1651,6 +1671,7 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
sds
buf
=
sdsempty
();
sds
buf
=
sdsempty
();
int
j
;
int
j
;
ssize_t
nwritten
;
ssize_t
nwritten
;
time_t
now
;
/* The DB this command was targetting is not the same as the last command
/* The DB this command was targetting is not the same as the last command
* we appendend. To issue a SELECT command is needed. */
* we appendend. To issue a SELECT command is needed. */
...
@@ -1691,8 +1712,15 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
...
@@ -1691,8 +1712,15 @@ static void feedAppendOnlyFile(struct redisCommand *cmd, int dictid, robj **argv
redisLog
(
REDIS_WARNING
,
"Aborting on short write while writing to the append-only file: %s"
,
strerror
(
errno
));
redisLog
(
REDIS_WARNING
,
"Aborting on short write while writing to the append-only file: %s"
,
strerror
(
errno
));
}
}
abort
();
abort
();
}
}
fsync
(
server
.
appendfd
);
/* Let's try to get this data on the disk */
now
=
time
(
NULL
);
if
(
server
.
appendfsync
==
APPENDFSYNC_ALWAYS
||
(
server
.
appendfsync
==
APPENDFSYNC_EVERYSEC
&&
now
-
server
.
lastfsync
>
1
))
{
fsync
(
server
.
appendfd
);
/* Let's try to get this data on the disk */
server
.
lastfsync
=
now
;
}
}
}
static
void
processInputBuffer
(
redisClient
*
c
)
{
static
void
processInputBuffer
(
redisClient
*
c
)
{
...
...
redis.conf
View file @
48f0308a
...
@@ -124,6 +124,23 @@ databases 16
...
@@ -124,6 +124,23 @@ databases 16
# appendonly yes
# appendonly yes
# The fsync() calls tells the Operating System to actually write data on disk
# instead to wait for more data in the output buffer. Some OS will really flush
# data on disk, some other OS will just try to do it ASAP.
#
# Redis supports three different modes:
#
# no: don't fsync, just let the OS flush the data when it wants. Faster.
# always: fsync after every write to the append only log . Slow, Safest.
# everysec: fsync only if one second passed since the last fsync. Compromise.
#
# The default is "no" since it's faster and anyway safer than snapshots from
# the point of view of durability of the latest records modified.
appendfsync
no
# appendfsync always
# appendfsync everysec
############################### ADVANCED CONFIG ###############################
############################### ADVANCED CONFIG ###############################
# Glue small output buffers together in order to send small replies in a
# Glue small output buffers together in order to send small replies in a
...
...
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