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

Fix module RdbLoad wrongly disable the AOF (#1001)

Browse Source 
In RdbLoad, we disable AOF before emptyData and rdbLoad to prevent copy-on-write issues. After rdbLoad completes, AOF should be re-enabled, but the code incorrectly checks server.aof_state, which has been reset to AOF_OFF in stopAppendOnly. This leads to AOF not being re-enabled after being disabled.
---------

Signed-off-by: Binbin <binloveplay1314@qq.com>
This commit is contained in:
Binbin 2024-09-11 12:00:08 +08:00 committed by Madelyn Olson
parent 45ae39af04
commit 6d03409e01
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/module.c
View File

@ -12928,6 +12928,9 @@ int VM_RdbLoad(ValkeyModuleCtx *ctx, ValkeyModuleRdbStream *stream, int flags) {
disconnectSlaves(); disconnectSlaves();
freeReplicationBacklog(); freeReplicationBacklog();
/* Stop and kill existing AOF rewriting fork as it is saving outdated data,
* we will re-enable it after the rdbLoad. Also killing it will prevent COW
* memory issue. */
if (server.aof_state != AOF_OFF) stopAppendOnly(); if (server.aof_state != AOF_OFF) stopAppendOnly();
/* Kill existing RDB fork as it is saving outdated data. Also killing it /* Kill existing RDB fork as it is saving outdated data. Also killing it
@ -12946,7 +12949,10 @@ int VM_RdbLoad(ValkeyModuleCtx *ctx, ValkeyModuleRdbStream *stream, int flags) {
int ret = rdbLoad(stream->data.filename,NULL,RDBFLAGS_NONE); int ret = rdbLoad(stream->data.filename,NULL,RDBFLAGS_NONE);
if (server.current_client) unprotectClient(server.current_client); if (server.current_client) unprotectClient(server.current_client);
if (server.aof_state != AOF_OFF) startAppendOnly();
/* Here we need to decide whether to enable the AOF based on the aof_enabled,
* since the previous stopAppendOnly sets aof_state to AOF_OFF. */
if (server.aof_enabled) startAppendOnly();
if (ret != RDB_OK) { if (ret != RDB_OK) {
errno = (ret == RDB_NOT_EXIST) ? ENOENT : EIO; errno = (ret == RDB_NOT_EXIST) ? ENOENT : EIO;

3
tests/unit/moduleapi/rdbloadsave.tcl
View File

@ -80,6 +80,9 @@ start_server {tags {"modules"}} {
fail "Can't find 'Killing AOF child' in recent log lines" fail "Can't find 'Killing AOF child' in recent log lines"
} }
# Verify that AOF is active.
assert_equal 1 [s aof_enabled]
# Verify the value in the loaded rdb # Verify the value in the loaded rdb
assert_equal v1 [r get k] assert_equal v1 [r get k]