Skip to content

Fix sourceNodeClusterInfo.MigratingSlot maybe nil when tryUpdateMigrationStatus #357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
git-hulk merged 3 commits into from
Oct 4, 2025
Merged

Fix sourceNodeClusterInfo.MigratingSlot maybe nil when tryUpdateMigrationStatus #357

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
762aba8
Fix sourceNodeClusterInfo.MigratingSlot maybe nil when tryUpdateMigra…
hll1213181368 Sep 29, 2025
2982f64
Update cluster.go
hll1213181368 Oct 3, 2025
bc72275
Update controller/cluster.go
git-hulk Oct 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 34 additions & 10 deletions controller/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,48 +338,72 @@ func (c *ClusterChecker) tryUpdateMigrationStatus(ctx context.Context, clonedClu
).Error("Failed to get the cluster info from the source node", zap.Error(err))
continue
}
if !sourceNodeClusterInfo.MigratingSlot.Equal(shard.MigratingSlot.SlotRange) {
log.Error("Mismatch migrating slot",

// If there is no migration information on the master node, you need to clear the migration information on the controller.
if sourceNodeClusterInfo.MigratingSlot == nil {
log.Error("Mismatch migrating slot, no migrating info on node",
zap.Int("shard_index", i),
zap.String("source_migrating_slot", sourceNodeClusterInfo.MigratingSlot.String()),
zap.String("source_node", sourceNode.Addr()),
zap.String("migrating_slot", shard.MigratingSlot.String()),
)
clonedCluster.Shards[i].ClearMigrateState()
if err = c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
log.Error("Failed to update the migrate state by UpdateCluster method", zap.Error(err))
return
}
c.updateCluster(clonedCluster)
continue
}
// If the migration information on the master node is inconsistent with the controller, you need to clear the migration information on the controller.
if sourceNodeClusterInfo.MigratingSlot != nil &&
!sourceNodeClusterInfo.MigratingSlot.Equal(shard.MigratingSlot.SlotRange) {
log.Error("Mismatch migrating slot",
zap.Int("shard_index", i),
zap.String("source node cluster info migrating_slot", sourceNodeClusterInfo.MigratingSlot.String()),
zap.String("controller migrating_slot", shard.MigratingSlot.String()),
)
clonedCluster.Shards[i].ClearMigrateState()
if err = c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
log.Error("Failed to update the migrate state by UpdateCluster method", zap.Error(err))
return
}
c.updateCluster(clonedCluster)
continue
}

if shard.TargetShardIndex < 0 || shard.TargetShardIndex >= len(clonedCluster.Shards) {
log.Error("Invalid target shard index", zap.Int("index", shard.TargetShardIndex))
return
}

migratingSlot := shard.MigratingSlot.String()
switch sourceNodeClusterInfo.MigratingState {
case "none", "start":
continue
case "fail":
migratingSlot := shard.MigratingSlot
clonedCluster.Shards[i].ClearMigrateState()
if err := c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
if err = c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
log.Error("Failed to update the cluster", zap.Error(err))
return
}
c.updateCluster(clonedCluster)
log.Warn("Failed to migrate the slot", zap.String("slot", migratingSlot.String()))
log.Warn("Failed to migrate the slot", zap.String("slot", migratingSlot))
case "success":
clonedCluster.Shards[i].SlotRanges = store.RemoveSlotFromSlotRanges(clonedCluster.Shards[i].SlotRanges, shard.MigratingSlot.SlotRange)
clonedCluster.Shards[shard.TargetShardIndex].SlotRanges = store.AddSlotToSlotRanges(
clonedCluster.Shards[shard.TargetShardIndex].SlotRanges, shard.MigratingSlot.SlotRange,
)
migratedSlot := shard.MigratingSlot
clonedCluster.Shards[i].ClearMigrateState()
if err := c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
if err = c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
log.Error("Failed to update the cluster", zap.Error(err))
return
} else {
log.Info("Migrate the slot successfully", zap.String("slot", migratedSlot.String()))
log.Info("Migrate the slot successfully", zap.String("slot", migratingSlot))
}
c.updateCluster(clonedCluster)
default:
clonedCluster.Shards[i].ClearMigrateState()
if err := c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
if err = c.clusterStore.UpdateCluster(ctx, c.namespace, clonedCluster); err != nil {
log.Error("Failed to update the cluster", zap.Error(err))
return
}
Expand Down
Loading