diff options
| author | Salvatore Sanfilippo <antirez@gmail.com> | 2018-06-16 11:05:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-16 11:05:04 +0200 |
| commit | 2e0ab4a80708d96f4107ff75686be5582e314f0f (patch) | |
| tree | aaf6e9aed40d9a8456fd5864fb5cb47250b40a8f /src/debug.c | |
| parent | 94658303e9ec5050189728fb8bc514ee682dd5fe (diff) | |
| parent | 7d269d5e633911628625d279b54e48c8b38fec90 (diff) | |
| download | redis-2e0ab4a80708d96f4107ff75686be5582e314f0f.tar.gz | |
Merge pull request #4976 from trevor211/fixDebugLoadaof
Critical: Fix server crash and data inconsistency in some cases.
Diffstat (limited to 'src/debug.c')
| -rw-r--r-- | src/debug.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/debug.c b/src/debug.c index 078ac3c67..478214751 100644 --- a/src/debug.c +++ b/src/debug.c @@ -348,7 +348,11 @@ NULL serverLog(LL_WARNING,"DB reloaded by DEBUG RELOAD"); addReply(c,shared.ok); } 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); if (loadAppendOnlyFile(server.aof_filename) != C_OK) { addReply(c,shared.err); |