[Fix] : wait follower statefulset ready before make cluster (#680)

drivebyer · web-flow · commit 52c67ffd6463 · 2023-10-26T19:56:33.000+05:30
Signed-off-by: drivebyer &lt;wuyangmuc@gmail.com&gt;
diff --git a/controllers/rediscluster_controller.go b/controllers/rediscluster_controller.go
@@ -159,7 +159,7 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request
 		return ctrl.Result{RequeueAfter: time.Second * 120}, nil
 	}
 
-	if int32(redisLeaderInfo.Status.ReadyReplicas) != leaderReplicas && int32(redisFollowerInfo.Status.ReadyReplicas) != followerReplicas {
+	if !(redisLeaderInfo.Status.ReadyReplicas == leaderReplicas && redisFollowerInfo.Status.ReadyReplicas == followerReplicas) {
 		reqLogger.Info("Redis leader and follower nodes are not ready yet", "Ready.Replicas", strconv.Itoa(int(redisLeaderInfo.Status.ReadyReplicas)), "Expected.Replicas", leaderReplicas)
 		return ctrl.Result{RequeueAfter: time.Second * 120}, nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -159,7 +159,7 @@ func (r *RedisClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request`
`159`	`159`	`return ctrl.Result{RequeueAfter: time.Second * 120}, nil`
`160`	`160`	`}`
`161`	`161`
`162`		`- if int32(redisLeaderInfo.Status.ReadyReplicas) != leaderReplicas && int32(redisFollowerInfo.Status.ReadyReplicas) != followerReplicas {`
	`162`	`+ if !(redisLeaderInfo.Status.ReadyReplicas == leaderReplicas && redisFollowerInfo.Status.ReadyReplicas == followerReplicas) {`
`163`	`163`	`reqLogger.Info("Redis leader and follower nodes are not ready yet", "Ready.Replicas", strconv.Itoa(int(redisLeaderInfo.Status.ReadyReplicas)), "Expected.Replicas", leaderReplicas)`
`164`	`164`	`return ctrl.Result{RequeueAfter: time.Second * 120}, nil`
`165`	`165`	`}`