Merge pull request #1438 from hongchaodeng/cc2

*: clear Available condition when doing recovery
coreos · Sep 22, 2017 · cbd36ca · cbd36ca
2 parents c7131f5 + bd2e152
commit cbd36ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pkg/apis/etcd/v1beta2/status.go b/pkg/apis/etcd/v1beta2/status.go
@@ -134,10 +134,12 @@ func (cs *ClusterStatus) SetScalingDownCondition(from, to int) {
 	cs.setClusterCondition(*c)
 }
 
-func (cs *ClusterStatus) AppendRecoveringCondition() {
+func (cs *ClusterStatus) SetRecoveringCondition() {
 	c := newClusterCondition(ClusterConditionRecovering, v1.ConditionTrue,
 		"Disaster recovery", "Majority is down. Recovering from backup")
 	cs.setClusterCondition(*c)
+
+	cs.ClearCondition(ClusterConditionAvailable)
 }
 
 func (cs *ClusterStatus) SetUpgradingCondition(to string) {

diff --git a/pkg/cluster/reconcile.go b/pkg/cluster/reconcile.go
@@ -213,7 +213,7 @@ func (c *Cluster) removeMember(toRemove *etcdutil.Member) error {
 }
 
 func (c *Cluster) disasterRecovery(left etcdutil.MemberSet) error {
-	c.status.AppendRecoveringCondition()
+	c.status.SetRecoveringCondition()
 
 	if c.cluster.Spec.SelfHosted != nil {
 		return errors.New("self-hosted cluster cannot be recovered from disaster")