Skip to content

Only touch currentForklessSave on the main thread #4467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JimB123 merged 2 commits into from
Aug 20, 2026
+1 −1
Merged

Only touch currentForklessSave on the main thread #4467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f2a494
fix(forkless): Only touch currentForklessSave on the main thread
Aug 18, 2026
c85c9bd
fix(forkless): Clear currentForklessSave when the iterator is released
Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/forkless.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ static void *forklessSaveProcessor(void *arg) {
serverLog(LL_NOTICE, "forkless-save: background processor finished. %ld items processed. %s",
items, message);

currentForklessSave = NULL;
saveInfo->err_code = err;
Comment thread
nitaicaro marked this conversation as resolved.
bgIteratorClose(saveInfo->iterator);
return NULL;
Expand Down Expand Up @@ -221,6 +220,7 @@ void forklessSaveComplete(bool terminated, void *privdata) {
saveInfo->terminated = terminated;
/* The save iterator should be terminated and freed at this point in time. */
saveInfo->iterator = NULL;
currentForklessSave = NULL;
/* For file based forkless save, we need to generate the RDB end marker. and complete the save */
if (!saveInfo->terminated && saveInfo->err_code == C_OK) {
saveInfo->err_code = rdbWriteFooter(&saveInfo->save_rio, REPLICA_REQ_NONE) == C_ERR ? C_ERR : C_OK;
Expand Down
Loading