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

VM now swaps objects out while loading datasets not fitting into vm-max-memory bytes of RAM

Browse Source
This commit is contained in:
antirez 2010-01-07 10:41:08 -05:00
parent 0d7170a454
commit b492cf00d8
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
redis.c
View File

@ -3178,6 +3178,7 @@ static int rdbLoad(char *filename) {
redisDb *db = server.db+0; redisDb *db = server.db+0;
char buf[1024]; char buf[1024];
time_t expiretime = -1, now = time(NULL); time_t expiretime = -1, 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;
@ -3235,6 +3236,13 @@ static int rdbLoad(char *filename) {
expiretime = -1; expiretime = -1;
} }
keyobj = o = NULL; keyobj = o = NULL;
/* Handle swapping while loading big datasets when VM is on */
loadedkeys++;
if (server.vm_enabled && (loadedkeys % 5000) == 0) {
while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObject() == REDIS_ERR) break;
}
}
} }
fclose(fp); fclose(fp);
return REDIS_OK; return REDIS_OK;
@ -6417,6 +6425,7 @@ 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;
if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0) if (redis_fstat(fileno(fp),&sb) != -1 && sb.st_size == 0)
return REDIS_ERR; return REDIS_ERR;
@ -6478,6 +6487,13 @@ int loadAppendOnlyFile(char *filename) {
/* Clean up, ready for the next command */ /* Clean up, ready for the next command */
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 */
loadedkeys++;
if (server.vm_enabled && (loadedkeys % 5000) == 0) {
while (zmalloc_used_memory() > server.vm_max_memory) {
if (vmSwapOneObject() == REDIS_ERR) break;
}
}
} }
fclose(fp); fclose(fp);
freeFakeClient(fakeClient); freeFakeClient(fakeClient);