fixed deepcopy []Pod

Author: polefishu

pkg/controller/distributedrediscluster/distributedrediscluster_controller.go

@@ -149,6 +149,7 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
 	}
 
 	ctx.pods = clusterPods(redisClusterPods.Items)
+	reqLogger.V(6).Info("debug cluster pods", "", ctx.pods)
 	ctx.healer = clustermanger.NewHealer(&heal.CheckAndHeal{
 		Logger:     reqLogger,
 		PodControl: k8sutil.NewPodController(r.client),
@@ -226,7 +227,9 @@ func (r *ReconcileDistributedRedisCluster) Reconcile(request reconcile.Request)
 	reqLogger.V(4).Info("buildClusterStatus", "status", status)
 	r.updateClusterIfNeed(instance, status)
 
+	instance.Status = *status
 	if needClusterOperation(instance, reqLogger) {
+		reqLogger.Info(">>>>>> clustering")
 		err = r.sync(ctx)
 		if err != nil {
 			new := instance.Status.DeepCopy()

pkg/controller/distributedrediscluster/helper.go

@@ -53,14 +53,15 @@ func newRedisAdmin(pods []*corev1.Pod, password string, cfg *config.Redis) (redi
 	for _, pod := range pods {
 		redisPort := redisutil.DefaultRedisPort
 		for _, container := range pod.Spec.Containers {
-			if container.Name == "redis-node" {
+			if container.Name == "redis" {
 				for _, port := range container.Ports {
-					if port.Name == "redis" {
+					if port.Name == "client" {
 						redisPort = fmt.Sprintf("%d", port.ContainerPort)
 					}
 				}
 			}
 		}
+		log.V(4).Info("append redis admin addr", "addr", pod.Status.PodIP, "port", redisPort)
 		nodesAddrs = append(nodesAddrs, net.JoinHostPort(pod.Status.PodIP, redisPort))
 	}
 	adminConfig := redisutil.AdminOptions{
@@ -148,7 +149,8 @@ func newRedisCluster(infos *redisutil.ClusterInfos, cluster *redisv1alpha1.Distr
 func clusterPods(pods []corev1.Pod) []*corev1.Pod {
 	var podSlice []*corev1.Pod
 	for _, pod := range pods {
-		podSlice = append(podSlice, &pod)
+		podPointer := pod
+		podSlice = append(podSlice, &podPointer)
 	}
 	return podSlice
 }

pkg/controller/distributedrediscluster/sync_handler.go

@@ -108,7 +108,7 @@ func (r *ReconcileDistributedRedisCluster) waitForClusterJoin(ctx *syncContext)
 	//	return Redis.Wrap(err, "SetConfigEpoch")
 	//}
 	if infos, err := ctx.admin.GetClusterInfos(); err == nil {
-		ctx.reqLogger.V(5).Info("debug waitForClusterJoin", "cluster infos", infos)
+		ctx.reqLogger.V(6).Info("debug waitForClusterJoin", "cluster infos", infos)
 		return nil
 	}
 	var firstNode *redisutil.Node

pkg/redisutil/admin.go

@@ -132,6 +132,7 @@ func (a *Admin) GetClusterInfos() (*ClusterInfos, error) {
 	for addr, c := range a.Connections().GetAll() {
 		nodeinfos, err := a.getInfos(c, addr)
 		if err != nil {
+			log.WithValues("err", err).Info("get redis info failed")
 			infos.Status = ClusterInfosPartial
 			clusterErr.partial = true
 			clusterErr.errs[addr] = err