optimize

pkg/manager/member/tikv_upgrader.go

@@ -295,24 +295,23 @@ func (u *tikvUpgrader) endEvictLeaderAfterUpgrade(tc *v1alpha1.TidbCluster, pod
 	// refer to https://github.com/pingcap/tiup/pull/2051
 
 	isLeaderTransferBackOrTimeout := func() bool {
+		leaderCountBefore := int(*store.LeaderCountBeforeUpgrade)
+		if leaderCountBefore < 200 {
+			klog.Infof("%s: leader count is %d and less than 200, so skip waiting leaders for transfer back", logPrefix, leaderCountBefore)
+			return true
+		}
+
 		evictLeaderEndTimeStr, exist := pod.Annotations[annoKeyEvictLeaderEndTime]
 		if !exist {
 			klog.Errorf("%s: miss annotation %q, so skip waiting leaders for transfer back", logPrefix, annoKeyEvictLeaderEndTime)
 			return true
 		}
-
 		evictLeaderEndTime, err := time.Parse(time.RFC3339, evictLeaderEndTimeStr)
 		if err != nil {
 			klog.Errorf("%s: parse annotation %q to time failed, so skip waiting leaders for transfer back", logPrefix, annoKeyEvictLeaderEndTime)
 			return true
 		}
 
-		leaderCountBefore := int(*store.LeaderCountBeforeUpgrade)
-		if leaderCountBefore < 200 {
-			klog.Infof("%s: leader count is %d and less than 200, so skip waiting leaders for transfer back", logPrefix, leaderCountBefore)
-			return true
-		}
-
 		timeout := tc.TiKVWaitLeaderTransferBackTimeout()
 		if time.Now().After(evictLeaderEndTime.Add(timeout)) {
 			klog.Infof("%s: time out with threshold %v, so skip waiting leaders for transfer back", logPrefix, timeout)