caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

smarter swapout policy on AOF too

Browse Source
This commit is contained in:
antirez 2010-06-02 15:18:22 +02:00
parent 7e02fe32d3
commit a89b7013ff
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
redis.c
View File

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