chore: allow replicaof in cluster mode when state is TAKEN_OVER #5618
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: kostas <[email protected]>
dranikpg
previously approved these changes
Aug 4, 2025
src/server/main_service.cc
Outdated
Comment on lines
1195
to
1197
| bool replicaof_in_cluster = cid->name() == "REPLICAOF" && IsClusterEnabled(); | ||
| allowed_by_state = dfly_cntx.conn()->IsPrivileged() || (cid->opt_mask() & CO::ADMIN) || | ||
| cid->name() == "PING"; | ||
| cid->name() == "PING" || replicaof_in_cluster; |
There was a problem hiding this comment.
Maybe just a command that reverts from TAKEN OVER To ACTIVE would've been easier
There was a problem hiding this comment.
You mean like a proper command in the registry right ?
I thought about it as well, the reason I chose this was to support a direct change from taken over to replica and since the replica flow flushed the datastore anyway it seemed to be simplest one 🤷
There was a problem hiding this comment.
I though of an ADMIN command and only then I realized that REPLICAOF already is one. Do we really need this condition if we have cid->opt_mask() & CO::ADMIN 🤔
romange
previously approved these changes
Aug 8, 2025
romange
approved these changes
Aug 11, 2025
dranikpg
approved these changes
Aug 11, 2025
dranikpg
pushed a commit
that referenced
this pull request
Aug 12, 2025
Signed-off-by: kostas <[email protected]>
EricHayter
pushed a commit
to EricHayter/dragonfly
that referenced
this pull request
Aug 16, 2025
…onflydb#5618) Signed-off-by: kostas <[email protected]>
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.
REPLTAKEOVERin cluster mode does not shut down master. Now a node that is inTAKEN_OVER_STATE(i,e, repltakeover) is allowed to become a replica of another node via theREPLICAOFcommand.Resolves #5611