@@ -28,6 +28,7 @@ import (
2828 "math/big"
2929 "net"
3030 "os"
31+ "sort"
3132 "strconv"
3233 "strings"
3334 "text/template"
@@ -461,6 +462,7 @@ func (r *ValkeyReconciler) getPodNames(ctx context.Context, valkey *hyperv1.Valk
461462 for _ , pod := range pods .Items {
462463 names = append (names , pod .Name + "." + valkey .Name + "-headless." + valkey .Namespace + ".svc" )
463464 }
465+ sort .Strings (names )
464466 return names , nil
465467}
466468
@@ -648,12 +650,15 @@ func (r *ValkeyReconciler) initCluster(ctx context.Context, valkey *hyperv1.Valk
648650 }
649651
650652 slaveChunks := chunkBy (slaveIndexes , int (valkey .Spec .Replicas ))
653+ logger .Info ("slaveChunks" , slaveChunks )
651654
652655 // set cluster replicate
653656 // 0 -> (shards - 1) are masters
654657 // shards -> replicas*shards-1 are slaves
655658 for i , slaves := range slaveChunks {
656659 masterID := ""
660+ masterPodName := podNames [i ]
661+ logger .Info ("setting cluster replicate" , "shard" , i , "masterPodName" , masterPodName )
657662 clusterNodesStr , err := clients [podNames [i ]].Do (ctx , clients [podNames [i ]].B ().ClusterNodes ().Build ()).ToString ()
658663 if err != nil {
659664 logger .Error (err , "failed to get cluster nodes" )
@@ -668,7 +673,7 @@ func (r *ValkeyReconciler) initCluster(ctx context.Context, valkey *hyperv1.Valk
668673
669674 for _ , j := range slaves {
670675 replica := podNames [j ]
671- logger .Info ("setting cluster replicate" , "shard" , i , "masterID" , masterID , "replica" , replica )
676+ logger .Info ("setting cluster replicate" , "shard" , i , "replica index" , j , " masterID" , masterID , "replica" , replica )
672677 if err := clients [replica ].Do (ctx , clients [replica ].B ().ClusterReplicate ().NodeId (masterID ).Build ()).Error (); err != nil {
673678 logger .Error (err , "failed to replicate" , "master" , masterID , "replica" , replica )
674679 return err
0 commit comments