Fix crash on RM_Call inside module load#11346
Merged
oranagra merged 4 commits intoredis:unstablefrom Oct 12, 2022
Merged
Conversation
The following [PR](redis#9320) instoduces initialization order changes. Now cluster is initialized after modules. This changes causes a crash if the module uses RM_Call inside the load function on cluster mode (the code will try to access `server.cluster` which at this point is NULL). To solve it, seperate cluster initialization into 2 phases: 1. Structure initialization that happened before the modules initialization 2. Listener initialization that happened after. Test was added to verify the fix.
oranagra
reviewed
Oct 2, 2022
Member
oranagra
left a comment
oranagra
left a comment
There was a problem hiding this comment.
i think this segment belongs in clusterInit
it could be that some RM_Call command would need these.
maybe it doesn't matter though, and we rather not mess up the blame log?
@madolson WDYT?
/* Initialize data for the Slot to key API. */
slotToKeyInit(server.db);
/* The slots -> channels map is a radix tree. Initialize it here. */
server.cluster->slots_to_channels = raxNew();
/* Set myself->port/cport/pport to my listening ports, we'll just need to
* discover the IP address via MEET messages. */
deriveAnnouncedPorts(&myself->port, &myself->pport, &myself->cport);
server.cluster->mf_end = 0;
server.cluster->mf_slave = NULL;
resetManualFailover();
clusterUpdateMyselfFlags();
clusterUpdateMyselfIp();
clusterUpdateMyselfHostname();
Contributor
|
I agree with Oran, I don't think we should just bisect the current clusterInit at the position we need for initializing the listeners, since it becomes more confusing in the future to understand what goes where. I would expect if we extract out the listener initialization code into a separate function "clusterInitListeners", hopefully that will protect the git blame enough. |
oranagra
approved these changes
Oct 12, 2022
Member
|
triggered cluster (and TLS) CI: |
Member
|
@MeirShpilraien looks like there's a crush in clusterInit when using TLS |
Author
|
@oranagra I hope I fixed it. Can you trigger it again? |
oranagra
approved these changes
Oct 12, 2022
Member
|
passed. |
madolson
pushed a commit
to madolson/redis
that referenced
this pull request
Apr 19, 2023
PR redis#9320 introduces initialization order changes. Now cluster is initialized after modules. This changes causes a crash if the module uses RM_Call inside the load function on cluster mode (the code will try to access `server.cluster` which at this point is NULL). To solve it, separate cluster initialization into 2 phases: 1. Structure initialization that happened before the modules initialization 2. Listener initialization that happened after. Test was added to verify the fix.
enjoy-binbin
pushed a commit
to enjoy-binbin/redis
that referenced
this pull request
Jul 31, 2023
PR redis#9320 introduces initialization order changes. Now cluster is initialized after modules. This changes causes a crash if the module uses RM_Call inside the load function on cluster mode (the code will try to access `server.cluster` which at this point is NULL). To solve it, separate cluster initialization into 2 phases: 1. Structure initialization that happened before the modules initialization 2. Listener initialization that happened after. Test was added to verify the fix.
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
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.
PR #9320 introduces initialization order changes. Now cluster is initialized after modules.
This changes causes a crash if the module uses RM_Call inside the load function
on cluster mode (the code will try to access
server.clusterwhich at this point is NULL).To solve it, separate cluster initialization into 2 phases:
Test was added to verify the fix.