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
b03dce95
Commit
b03dce95
authored
Jun 02, 2010
by
antirez
Browse files
smarter swapout policy on AOF too
parent
1bc18373
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
b03dce95
...
@@ -4057,7 +4057,6 @@ static int rdbLoad(char *filename) {
...
@@ -4057,7 +4057,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;
...
@@ -4115,7 +4114,6 @@ static int rdbLoad(char *filename) {
...
@@ -4115,7 +4114,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);
...
@@ -4141,6 +4139,7 @@ static int rdbLoad(char *filename) {
...
@@ -4141,6 +4139,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;
...
@@ -8335,7 +8334,6 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8335,7 +8334,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)
...
@@ -8358,6 +8356,7 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8358,6 +8356,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))
...
@@ -8398,8 +8397,11 @@ int loadAppendOnlyFile(char *filename) {
...
@@ -8398,8 +8397,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;
}
}
...
...
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