Free module context even if there was no content written in auxsave2 #2132
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jacob Murphy <[email protected]>
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## unstable #2132 +/- ##
============================================
- Coverage 71.18% 71.07% -0.11%
============================================
Files 122 122
Lines 66046 66049 +3
============================================
- Hits 47013 46943 -70
- Misses 19033 19106 +73
🚀 New features to boost your workflow:
|
zuiderkwast
reviewed
May 25, 2025
Contributor
zuiderkwast
left a comment
zuiderkwast
left a comment
There was a problem hiding this comment.
Fix looks correct to me.
Ideally we should have a test covering this path. There seems to be test code for it in https://github.com/valkey-io/valkey/blob/8.1.1/tests/modules/testrdb.c#L350-L360 and test cases https://github.com/valkey-io/valkey/blob/8.1.1/tests/unit/moduleapi/testrdb.tcl#L30-L57. Why didn't these test cases catch this bug?
Contributor
|
@murphyjacob4 If the module wants to support older Valkey without this fix, it still needs some workaround for this bug, right? |
zuiderkwast
approved these changes
May 27, 2025
github-project-automation
bot
moved this from In Progress
to To be backported
in Valkey 7.2
github-project-automation
bot
moved this from In Progress
to To be backported
in Valkey 8.0
github-project-automation
bot
moved this from In Progress
to To be backported
in Valkey 8.1
Contributor
Author
Right. It would be required that, if a module is using auxsave2, the module context is not created from the RDB (via VM_GetContextFromIO https://github.com/valkey-io/valkey/blob/unstable/src/module.c#L7602-L7607) unless some contents are going to be saved to the RDB.
Looks like we don't create a context in the save path https://github.com/valkey-io/valkey/blob/8.1.1/tests/modules/testrdb.c#L97-L116 Let me follow up with a test change to catch this |
Contributor
Author
|
See #2150 for tests |
enjoy-binbin
pushed a commit
that referenced
this pull request
May 30, 2025
) See #2132 for the fix. This just ensures that we always create context in all branches of aux_load and aux_save Signed-off-by: Jacob Murphy <[email protected]>
hpatro
pushed a commit
to hpatro/valkey
that referenced
this pull request
Jun 4, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]>
hpatro
pushed a commit
to hpatro/valkey
that referenced
this pull request
Jun 4, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: Harkrishn Patro <[email protected]>
hpatro
pushed a commit
that referenced
this pull request
Jun 9, 2025
…2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes #2125 Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: Harkrishn Patro <[email protected]>
hpatro
pushed a commit
that referenced
this pull request
Jun 11, 2025
…2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes #2125 Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: Harkrishn Patro <[email protected]>
chzhoo
pushed a commit
to chzhoo/valkey
that referenced
this pull request
Jun 12, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: chzhoo <[email protected]>
chzhoo
pushed a commit
to chzhoo/valkey
that referenced
this pull request
Jun 12, 2025
…lkey-io#2150) See valkey-io#2132 for the fix. This just ensures that we always create context in all branches of aux_load and aux_save Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: chzhoo <[email protected]>
vitarb
pushed a commit
to vitarb/valkey
that referenced
this pull request
Jun 12, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f)
Merged
vitarb
pushed a commit
to vitarb/valkey
that referenced
this pull request
Jun 13, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f)
shanwan1
pushed a commit
to shanwan1/valkey
that referenced
this pull request
Jun 13, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: shanwan1 <[email protected]>
shanwan1
pushed a commit
to shanwan1/valkey
that referenced
this pull request
Jun 13, 2025
…lkey-io#2150) See valkey-io#2132 for the fix. This just ensures that we always create context in all branches of aux_load and aux_save Signed-off-by: Jacob Murphy <[email protected]> Signed-off-by: shanwan1 <[email protected]>
ranshid
pushed a commit
to ranshid/valkey
that referenced
this pull request
Jun 18, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]>
ranshid
pushed a commit
to ranshid/valkey
that referenced
this pull request
Jun 22, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]>
ranshid
pushed a commit
that referenced
this pull request
Jul 7, 2025
…2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes #2125 Signed-off-by: Jacob Murphy <[email protected]>
zuiderkwast
pushed a commit
to vitarb/valkey
that referenced
this pull request
Aug 15, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f)
zuiderkwast
pushed a commit
to vitarb/valkey
that referenced
this pull request
Aug 15, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f) Signed-off-by: Viktor Söderqvist <[email protected]>
zuiderkwast
pushed a commit
to vitarb/valkey
that referenced
this pull request
Aug 21, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f) Signed-off-by: Viktor Söderqvist <[email protected]>
zuiderkwast
pushed a commit
that referenced
this pull request
Aug 22, 2025
…2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes #2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f) Signed-off-by: Viktor Söderqvist <[email protected]>
sarthakaggarwal97
pushed a commit
to sarthakaggarwal97/valkey
that referenced
this pull request
Sep 16, 2025
…alkey-io#2132) When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback. https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still. Fixes valkey-io#2125 Signed-off-by: Jacob Murphy <[email protected]> (cherry picked from commit 258213f) Signed-off-by: Viktor Söderqvist <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When a module saves to the Aux metadata with aux_save2 callback, the module context is not freed if the module didn't save anything in the callback.
https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1277-L1284. Note that we return 0, however we should be doing the cleanup done on https://github.com/valkey-io/valkey/blob/8.1.1/src/rdb.c#L1300-L1303 still.
Fixes #2125