remove unnecessary pod and statefulset update (#101)

pingcap · Sep 20, 2018 · 669b023 · 669b023
1 parent b1731d7
commit 669b023
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/pkg/controller/pod_control.go b/pkg/controller/pod_control.go
@@ -100,14 +100,16 @@ func (rpc *realPodControl) UpdateMetaInfo(tc *v1alpha1.TidbCluster, pod *corev1.
 	podName := pod.GetName()
 	labels := pod.GetLabels()
 	tcName := tc.GetName()
-	var clusterID, storeID, memberID string
 	if labels == nil {
 		return pod, fmt.Errorf("pod %s/%s has empty labels, TidbCluster: %s", ns, podName, tcName)
 	}
 	_, ok := labels[label.InstanceLabelKey]
 	if !ok {
 		return pod, fmt.Errorf("pod %s/%s doesn't have %s label, TidbCluster: %s", ns, podName, label.InstanceLabelKey, tcName)
 	}
+	clusterID := labels[label.ClusterIDLabelKey]
+	memberID := labels[label.MemberIDLabelKey]
+	storeID := labels[label.StoreIDLabelKey]
 	pdClient := rpc.pdControl.GetPDClient(tc)
 	if labels[label.ClusterIDLabelKey] == "" {
 		cluster, err := pdClient.GetCluster()

diff --git a/pkg/manager/member/tidb_member_manager.go b/pkg/manager/member/tidb_member_manager.go
@@ -149,7 +149,7 @@ func (tmm *tidbMemberManager) syncTiDBStatefulSetForTidbCluster(tc *v1alpha1.Tid
 		}
 	}
 
-	if !statefulSetEqual(*oldTiDBSet, *newTiDBSet) {
+	if !statefulSetEqual(*newTiDBSet, *oldTiDBSet) {
 		set := *oldTiDBSet
 		set.Spec.Template = newTiDBSet.Spec.Template
 		*set.Spec.Replicas = *newTiDBSet.Spec.Replicas

diff --git a/pkg/manager/member/utils.go b/pkg/manager/member/utils.go
@@ -130,7 +130,8 @@ func statefulSetEqual(new apps.StatefulSet, old apps.StatefulSet) bool {
 			glog.Errorf("unmarshal Statefulset: [%s/%s]'s applied config failed,error: %v", old.GetNamespace(), old.GetName(), err)
 			return false
 		}
-		return apiequality.Semantic.DeepEqual(oldConfig, new.Spec)
+		return apiequality.Semantic.DeepEqual(oldConfig.Replicas, new.Spec.Replicas) &&
+			apiequality.Semantic.DeepEqual(oldConfig.Template, new.Spec.Template)
 	}
 	return false
 }