Fix temp file leak druing replication error handling #1721
Conversation
This file contains 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
Before actually entering REPL_STATE_TRANSFER, we usually have some other things to do, such as registering the ae handler, etc. If an error occurs at this time, we may leak the previously opened temp file. This commit adds a new cleanupTransferResources function to do the cleanup, avoiding code duplication. Signed-off-by: Binbin <[email protected]>
enjoy-binbin
commented
Feb 13, 2025
| @@ -2871,8 +2867,7 @@ static void dualChannelFullSyncWithPrimary(connection *conn) { | |||
| connClose(server.repl_rdb_transfer_s); | |||
| server.repl_rdb_transfer_s = NULL; | |||
| } | |||
| if (server.repl_transfer_fd != -1) close(server.repl_transfer_fd); | |||
| server.repl_transfer_fd = -1; | |||
| cleanupTransferResources(); | |||
| server.repl_state = REPL_STATE_CONNECT; | |||
| replicationAbortDualChannelSyncTransfer(); | |||
There was a problem hiding this comment.
replicationAbortDualChannelSyncTransfer also some cleanups, like replicationAbortDualChannelSyncTransfer will close repl_rdb_transfer_s and repl_transfer_fd. We can remove it in here. Please let me know if you want it removed.
enjoy-binbin
commented
Feb 13, 2025
| @@ -2871,8 +2867,7 @@ static void dualChannelFullSyncWithPrimary(connection *conn) { | |||
| connClose(server.repl_rdb_transfer_s); | |||
| server.repl_rdb_transfer_s = NULL; | |||
There was a problem hiding this comment.
the leak may happen in here, we should also unlink the tmp file
enjoy-binbin
commented
Feb 13, 2025
| @@ -3856,10 +3852,7 @@ void syncWithPrimary(connection *conn) { | |||
| connClose(server.repl_rdb_transfer_s); | |||
| server.repl_rdb_transfer_s = NULL; | |||
| } | |||
| if (server.repl_transfer_fd != -1) close(server.repl_transfer_fd); | |||
| if (server.repl_transfer_tmpfile) zfree(server.repl_transfer_tmpfile); | |||
There was a problem hiding this comment.
the leak may happen in here, we should also unlink the tmp file.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## unstable #1721 +/- ##
============================================
- Coverage 70.97% 70.93% -0.04%
============================================
Files 123 123
Lines 65536 65532 -4
============================================
- Hits 46511 46488 -23
- Misses 19025 19044 +19
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Before actually entering REPL_STATE_TRANSFER, we usually have
some other things to do, such as registering the ae handler, etc.
If an error occurs at this time, we may leak the previously opened
temp file.
This commit adds a new cleanupTransferResources function to do the
cleanup, avoiding code duplication.