diff --git a/pkg/controllers/cluster/controller.go b/pkg/controllers/cluster/controller.go index 1e2427fc3..8da9ec7f6 100644 --- a/pkg/controllers/cluster/controller.go +++ b/pkg/controllers/cluster/controller.go @@ -470,7 +470,7 @@ func (m *MySQLController) updateClusterStatus(cluster *v1alpha1.Cluster, ss *app if condition == nil { condition = &v1alpha1.ClusterCondition{Type: v1alpha1.ClusterReady} } - if ss.Status.ReadyReplicas == ss.Status.Replicas { + if ss.Status.ReadyReplicas == ss.Status.Replicas && ss.Status.ReadyReplicas == cluster.Spec.Members { condition.Status = corev1.ConditionTrue } else { condition.Status = corev1.ConditionFalse diff --git a/test/e2e/framework/cluster.go b/test/e2e/framework/cluster.go index e74b2836f..6a49f7ad0 100644 --- a/test/e2e/framework/cluster.go +++ b/test/e2e/framework/cluster.go @@ -136,7 +136,6 @@ func (j *ClusterTestJig) waitForConditionOrFail(namespace, name string, timeout func (j *ClusterTestJig) WaitForClusterReadyOrFail(namespace, name string, timeout time.Duration) *v1alpha1.Cluster { Logf("Waiting up to %v for Cluster \"%s/%s\" to be ready", timeout, namespace, name) cluster := j.waitForConditionOrFail(namespace, name, timeout, "have all nodes ready", func(cluster *v1alpha1.Cluster) bool { - Logf("Cluster conditions: %#v", cluster.Status.Conditions) return clusterutil.IsClusterReady(cluster) }) return cluster