fix(cluster): should stop the migration if it's changed to the slave role #2716
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
RiversJin
force-pushed
the
fix/migration
branch
from
2091349 to
6b25971
Compare
|
@RiversJin Thanks for raising this issue. You're right that we should stop the migration while becoming to the slave role. |
git-hulk
changed the title
git-hulk
reviewed
Jan 8, 2025
src/cluster/cluster.cc
Outdated
| if (myself_->role == kClusterMaster) { | ||
| // Master mode | ||
| auto s = srv_->RemoveMaster(); | ||
| if (!s.IsOK()) { | ||
| return s.Prefixed("failed to remove master"); | ||
| } | ||
| LOG(INFO) << "MASTER MODE enabled by cluster topology setting"; | ||
| } else if (nodes_.find(myself_->master_id) != nodes_.end()) { | ||
| if (is_slave && is_cluster_enabled) { |
There was a problem hiding this comment.
Suggested change
| if (is_slave && is_cluster_enabled) { | |
| if (is_slave && is_cluster_enabled && srv_->slot_migrator) { |
There was a problem hiding this comment.
The slot_migrator might be null pointer while starting the server.
src/cluster/cluster.cc
Outdated
| if (is_slave && is_cluster_enabled) { | ||
| // Slave -> Master | ||
| srv_->slot_migrator->SetStopMigrationFlag(false); | ||
| LOG(INFO) << "Change server role to master, stop migration task"; |
There was a problem hiding this comment.
Wrong log message, it should restart the migration task instead of the stop.
src/cluster/cluster.cc
Outdated
| auto s = srv_->AddMaster(master->host, master->port, false); | ||
| if (!s.IsOK()) { | ||
| LOG(WARNING) << "SLAVE OF " << master->host << ":" << master->port | ||
| << " wasn't enabled by cluster topology setting, encounter error: " << s.Msg(); | ||
| return s.Prefixed("failed to add master"); | ||
| } | ||
| LOG(INFO) << "SLAVE OF " << master->host << ":" << master->port << " enabled by cluster topology setting"; | ||
| if (!is_slave && is_cluster_enabled) { |
There was a problem hiding this comment.
Suggested change
| if (!is_slave && is_cluster_enabled) { | |
| if (!is_slave && is_cluster_enabled && srv_->slot_migrator) { |
RiversJin
force-pushed
the
fix/migration
branch
from
f0a4446 to
eb331f8
Compare
|
caipengbo
approved these changes
Jan 9, 2025
git-hulk
approved these changes
Jan 9, 2025
PragmaTwice
approved these changes
Jan 9, 2025
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.
In cluster mode, if a master-slave failover occurs, it seems that slot migration is not properly stopped. However, the slave of command has corresponding update logic. So, this is a bug, right?