opensourcemirror
/
redis
mirror of https://github.com/antirez/redis.git
1
0
Fork 0
Code Issues Releases Wiki Activity

better swapout policy while loading RDB file

This commit is contained in:
antirez 2010-06-02 15:13:53 +02:00
parent 356f923913
commit 7e02fe32d3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redis.c
View File

@ -4120,6 +4120,7 @@ static int rdbLoad(char *filename) {
}
while(1) {
robj *key, *val;
int force_swapout;
expiretime = -1;
/* Read type. */
@ -4184,9 +4185,13 @@ static int rdbLoad(char *filename) {
continue;
}
force_swapout = 0;
if ((zmalloc_used_memory() - server.vm_max_memory) > 1024*1024*32)
force_swapout = 1;
/* If we have still some hope of having some value fitting memory
* then we try random sampling. */
if (!swap_all_values && server.vm_enabled && (loadedkeys % 5000) == 0) {
if (!swap_all_values && server.vm_enabled && force_swapout) {
while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
}