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

fixed a bug in bgsave when VM is off but still it was testing for obj->storage field

Browse Source
This commit is contained in:
antirez 2010-01-05 19:51:30 -05:00
parent f2b8ab346a
commit 38823f0817
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
redis.c
View File

@ -2888,7 +2888,7 @@ static int rdbSave(char *filename) {
} }
/* Save the key and associated value. This requires special /* Save the key and associated value. This requires special
* handling if the value is swapped out. */ * handling if the value is swapped out. */
if (key->storage == REDIS_VM_MEMORY) { if (!server.vm_enabled || key->storage == REDIS_VM_MEMORY) {
/* Save type, key, value */ /* Save type, key, value */
if (rdbSaveType(fp,o->type) == -1) goto werr; if (rdbSaveType(fp,o->type) == -1) goto werr;
if (rdbSaveStringObject(fp,key) == -1) goto werr; if (rdbSaveStringObject(fp,key) == -1) goto werr;
@ -6532,7 +6532,7 @@ static int rewriteAppendOnlyFile(char *filename) {
int swapped; int swapped;
key = dictGetEntryKey(de); key = dictGetEntryKey(de);
if (key->storage == REDIS_VM_MEMORY) { if (!server.vm_enabled || key->storage == REDIS_VM_MEMORY) {
o = dictGetEntryVal(de); o = dictGetEntryVal(de);
swapped = 0; swapped = 0;
} else { } else {
@ -6889,7 +6889,7 @@ static int vmSwapObject(robj *key, robj *val) {
static robj *vmGenericLoadObject(robj *key, int preview) { static robj *vmGenericLoadObject(robj *key, int preview) {
robj *val; robj *val;
assert(key->storage == REDIS_VM_SWAPPED); redisAssert(key->storage == REDIS_VM_SWAPPED);
if (fseeko(server.vm_fp,key->vm.page*server.vm_page_size,SEEK_SET) == -1) { if (fseeko(server.vm_fp,key->vm.page*server.vm_page_size,SEEK_SET) == -1) {
redisLog(REDIS_WARNING, redisLog(REDIS_WARNING,
"Unrecoverable VM problem in vmLoadObject(): can't seek: %s", "Unrecoverable VM problem in vmLoadObject(): can't seek: %s",