Skip to content

fix: check primary node first when resolving shard index #207

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
bjosv merged 1 commit into from
May 31, 2026
Merged

fix: check primary node first when resolving shard index #207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions internal/controller/valkeycluster_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1207,9 +1207,16 @@ func (r *ValkeyClusterReconciler) deleteExcessValkeyNodes(ctx context.Context, c
return deleted, nil
}

// shardIndexFromState determines the pod shard-index for a given Valkey shard
// by matching any of its nodes' addresses to ValkeyNode labels.
// shardIndexFromState determines the shard index for a given Valkey Cluster
// shard by matching its node addresses to ValkeyNode shard-index labels. It checks
// the primary first, falling back to any node if unavailable.
func shardIndexFromState(shard *valkey.ShardState, nodes *valkeyiov1alpha1.ValkeyNodeList) int {
if primary := shard.GetPrimaryNode(); primary != nil {
_, shardIndex := nodeRoleAndShard(primary.Address, nodes)
if shardIndex >= 0 {
return shardIndex
}
}
for _, node := range shard.Nodes {
_, shardIndex := nodeRoleAndShard(node.Address, nodes)
if shardIndex >= 0 {
Expand Down