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
a89b7013
Commit
a89b7013
authored
Jun 02, 2010
by
antirez
Browse files
smarter swapout policy on AOF too
parent
7e02fe32
Changes
1
Show whitespace changes
Inline
Side-by-side
redis.c
View file @
a89b7013
...
...
@@ -4101,7 +4101,6 @@ static int rdbLoad(char *filename) {
redisDb
*
db
=
server
.
db
+
0
;
char
buf
[
1024
];
time_t
expiretime
,
now
=
time
(
NULL
);
long
long
loadedkeys
=
0
;
fp
=
fopen
(
filename
,
"r"
);
if
(
!
fp
)
return
REDIS_ERR
;
...
...
@@ -4159,7 +4158,6 @@ static int rdbLoad(char *filename) {
redisLog
(
REDIS_WARNING
,
"Loading DB, duplicated key (%s) found! Unrecoverable error, exiting now."
,
key
->
ptr
);
exit
(
1
);
}
loadedkeys
++
;
/* Set the expire time if needed */
if
(
expiretime
!=
-
1
)
setExpire
(
db
,
key
,
expiretime
);
...
...
@@ -4185,6 +4183,7 @@ static int rdbLoad(char *filename) {
continue
;
}
/* Flush data on disk once 32 MB of additional RAM are used... */
force_swapout
=
0
;
if
((
zmalloc_used_memory
()
-
server
.
vm_max_memory
)
>
1024
*
1024
*
32
)
force_swapout
=
1
;
...
...
@@ -8409,7 +8408,6 @@ int loadAppendOnlyFile(char *filename) {
struct
redisClient
*
fakeClient
;
FILE
*
fp
=
fopen
(
filename
,
"r"
);
struct
redis_stat
sb
;
unsigned
long
long
loadedkeys
=
0
;
int
appendonly
=
server
.
appendonly
;
if
(
redis_fstat
(
fileno
(
fp
),
&
sb
)
!=
-
1
&&
sb
.
st_size
==
0
)
...
...
@@ -8432,6 +8430,7 @@ int loadAppendOnlyFile(char *filename) {
char
buf
[
128
];
sds
argsds
;
struct
redisCommand
*
cmd
;
int
force_swapout
;
if
(
fgets
(
buf
,
sizeof
(
buf
),
fp
)
==
NULL
)
{
if
(
feof
(
fp
))
...
...
@@ -8472,8 +8471,11 @@ int loadAppendOnlyFile(char *filename) {
for
(
j
=
0
;
j
<
argc
;
j
++
)
decrRefCount
(
argv
[
j
]);
zfree
(
argv
);
/* Handle swapping while loading big datasets when VM is on */
loadedkeys
++
;
if
(
server
.
vm_enabled
&&
(
loadedkeys
%
5000
)
==
0
)
{
force_swapout
=
0
;
if
((
zmalloc_used_memory
()
-
server
.
vm_max_memory
)
>
1024
*
1024
*
32
)
force_swapout
=
1
;
if
(
server
.
vm_enabled
&&
force_swapout
)
{
while
(
zmalloc_used_memory
()
>
server
.
vm_max_memory
)
{
if
(
vmSwapOneObjectBlocking
()
==
REDIS_ERR
)
break
;
}
...
...
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