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

Merge pull request #4976 from trevor211/fixDebugLoadaof

Browse Source 
Critical: Fix server crash and data inconsistency in some cases.
This commit is contained in:
Salvatore Sanfilippo 2018-06-16 11:05:04 +02:00 committed by GitHub
commit 2e0ab4a807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/debug.c
View File

@ -348,7 +348,11 @@ NULL
serverLog(LL_WARNING,"DB reloaded by DEBUG RELOAD"); serverLog(LL_WARNING,"DB reloaded by DEBUG RELOAD");
addReply(c,shared.ok); addReply(c,shared.ok);
} else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) { } else if (!strcasecmp(c->argv[1]->ptr,"loadaof")) {
if (server.aof_state == AOF_ON) flushAppendOnlyFile(1); if (server.aof_state == AOF_OFF) {
addReply(c, shared.err);
return;
}
flushAppendOnlyFile(1);
emptyDb(-1,EMPTYDB_NO_FLAGS,NULL); emptyDb(-1,EMPTYDB_NO_FLAGS,NULL);
if (loadAppendOnlyFile(server.aof_filename) != C_OK) { if (loadAppendOnlyFile(server.aof_filename) != C_OK) {
addReply(c,shared.err); addReply(c,shared.err);