fluencelabs/redis
1
0
Fork 0
mirror of https://github.com/fluencelabs/redis synced 2025-06-19 20:21:21 +00:00
Code Issues Projects Releases Wiki Activity

better swapout policy while loading RDB file

Browse Source
This commit is contained in:
antirez
2010-06-02 15:13:53 +02:00
parent 2691b01bee
commit 1bc183731d
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
redis.c
View File

@ -4076,6 +4076,7 @@ static int rdbLoad(char *filename) {
} }
while(1) { while(1) {
robj *key, *val; robj *key, *val;
int force_swapout;
expiretime = -1; expiretime = -1;
/* Read type. */ /* Read type. */
@ -4140,9 +4141,13 @@ static int rdbLoad(char *filename) {
continue; 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 /* If we have still some hope of having some value fitting memory
* then we try random sampling. */ * 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) { while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObjectBlocking() == REDIS_ERR) break; if (vmSwapOneObjectBlocking() == REDIS_ERR) break;
} }