gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

AOF loading: split handling of format errors from unexpected EOF.

Browse Source
This commit is contained in:
antirez 2014-09-05 09:56:26 +02:00
parent d9f0094154
commit 0ab04287aa
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/aof.c
View File

@ -645,7 +645,7 @@ int loadAppendOnlyFile(char *filename) {
argsds = sdsnewlen(NULL,len); argsds = sdsnewlen(NULL,len);
if (len && fread(argsds,len,1,fp) == 0) goto fmterr; if (len && fread(argsds,len,1,fp) == 0) goto fmterr;
argv[j] = createObject(REDIS_STRING,argsds); argv[j] = createObject(REDIS_STRING,argsds);
if (fread(buf,2,1,fp) == 0) goto fmterr; /* discard CRLF */ if (fread(buf,2,1,fp) == 0) goto readerr; /* discard CRLF */
} }
/* Command lookup */ /* Command lookup */
@ -673,7 +673,7 @@ int loadAppendOnlyFile(char *filename) {
/* This point can only be reached when EOF is reached without errors. /* This point can only be reached when EOF is reached without errors.
* If the client is in the middle of a MULTI/EXEC, log error and quit. */ * If the client is in the middle of a MULTI/EXEC, log error and quit. */
if (fakeClient->flags & REDIS_MULTI) goto readerr; if (fakeClient->flags & REDIS_MULTI) goto uxeof;
fclose(fp); fclose(fp);
freeFakeClient(fakeClient); freeFakeClient(fakeClient);
@ -683,14 +683,17 @@ int loadAppendOnlyFile(char *filename) {
server.aof_rewrite_base_size = server.aof_current_size; server.aof_rewrite_base_size = server.aof_current_size;
return REDIS_OK; return REDIS_OK;
readerr: readerr: /* Read error. If feof(fp) is true, fall through to unexpected EOF. */
if (feof(fp)) { if (!feof(fp)) {
redisLog(REDIS_WARNING,"Unexpected end of file reading the append only file");
} else {
redisLog(REDIS_WARNING,"Unrecoverable error reading the append only file: %s", strerror(errno)); redisLog(REDIS_WARNING,"Unrecoverable error reading the append only file: %s", strerror(errno));
exit(1);
} }
uxeof: /* Unexpected AOF end of file. */
redisLog(REDIS_WARNING,"Unexpected end of file reading the append only file");
exit(1); exit(1);
fmterr:
fmterr: /* Format error. */
redisLog(REDIS_WARNING,"Bad file format reading the append only file: make a backup of your AOF file, then use ./redis-check-aof --fix <filename>"); redisLog(REDIS_WARNING,"Bad file format reading the append only file: make a backup of your AOF file, then use ./redis-check-aof --fix <filename>");
exit(1); exit(1);
} }

2
tests/integration/aof.tcl
View File

@ -56,7 +56,7 @@ tags {"aof"} {
start_server_aof [list dir $server_path] { start_server_aof [list dir $server_path] {
test "Short read: Server should have logged an error" { test "Short read: Server should have logged an error" {
set pattern "*Bad file format reading the append only file*" set pattern "*Unexpected end of file reading the append only file*"
set retry 10 set retry 10
while {$retry} { while {$retry} {
set result [exec tail -n1 < [dict get $srv stdout]] set result [exec tail -n1 < [dict get $srv stdout]]