cherry pick pingcap#2507 to release-1.1

Signed-off-by: sre-bot <sre-bot@pingcap.com>

pkg/webhook/pod/pd_deleter.go

@@ -84,7 +84,7 @@ func (pc *PodAdmissionControl) admitDeletePdPods(payload *admitPayload) *admissi
 	// check the pd pods which have been upgraded before were all health
 	if isUpgrading {
 		klog.Infof("receive delete pd pod[%s/%s] of tc[%s/%s] is upgrading, make sure former pd upgraded status was health", namespace, name, namespace, tcName)
-		err = checkFormerPDPodStatus(pc.kubeCli, payload.pdClient, payload.tc, namespace, ordinal, *payload.ownerStatefulSet.Spec.Replicas)
+		err = checkFormerPDPodStatus(pc.kubeCli, payload.pdClient, payload.tc, payload.ownerStatefulSet, ordinal)
 		if err != nil {
 			return util.ARFail(err)
 		}

pkg/webhook/pod/pd_deleter_test.go

@@ -15,8 +15,6 @@ package pod
 
 import (
 	"fmt"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -30,7 +28,9 @@ import (
 	admission "k8s.io/api/admission/v1beta1"
 	apps "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	kubefake "k8s.io/client-go/kubernetes/fake"
 	k8sTesting "k8s.io/client-go/testing"
 )
@@ -67,7 +67,7 @@ func TestPDDeleterDelete(t *testing.T) {
 
 		deletePod := newPDPodForPDPodAdmissionControl()
 		ownerStatefulSet := newOwnerStatefulSetForPDPodAdmissionControl()
-		tc := newTidbClusterForPodAdmissionControl()
+		tc := newTidbClusterForPodAdmissionControl(pdReplicas, tikvReplicas)
 		kubeCli := kubefake.NewSimpleClientset()
 
 		if test.UpdatePVCErr {

pkg/webhook/pod/pods_test.go

@@ -14,6 +14,7 @@
 package pod
 
 import (
+	"strconv"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -139,8 +140,8 @@ func newPodAdmissionControl(kubeCli kubernetes.Interface) *PodAdmissionControl {
 	}
 }
 
-func newTidbClusterForPodAdmissionControl() *v1alpha1.TidbCluster {
-	return &v1alpha1.TidbCluster{
+func newTidbClusterForPodAdmissionControl(pdReplicas int32, tikvReplicas int32) *v1alpha1.TidbCluster {
+	tc := &v1alpha1.TidbCluster{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "TidbCluster",
 			APIVersion: "pingcap.com/v1alpha1",
@@ -171,26 +172,29 @@ func newTidbClusterForPodAdmissionControl() *v1alpha1.TidbCluster {
 			TiKV: v1alpha1.TiKVStatus{
 				Synced: true,
 				Phase:  v1alpha1.NormalPhase,
-				Stores: map[string]v1alpha1.TiKVStore{
-					"0": {
-						PodName:     memberUtils.TikvPodName(tcName, 0),
-						LeaderCount: 1,
-						State:       v1alpha1.TiKVStateUp,
-					},
-					"1": {
-						PodName:     memberUtils.TikvPodName(tcName, 1),
-						LeaderCount: 1,
-						State:       v1alpha1.TiKVStateUp,
-					},
-					"2": {
-						PodName:     memberUtils.TikvPodName(tcName, 2),
-						LeaderCount: 1,
-						State:       v1alpha1.TiKVStateUp,
-					},
-				},
+				Stores: map[string]v1alpha1.TiKVStore{},
+			},
+			PD: v1alpha1.PDStatus{
+				Synced:  true,
+				Phase:   v1alpha1.NormalPhase,
+				Members: map[string]v1alpha1.PDMember{},
 			},
 		},
 	}
+	for i := 0; int32(i) < tikvReplicas; i++ {
+		tc.Status.TiKV.Stores[strconv.Itoa(i)] = v1alpha1.TiKVStore{
+			PodName:     memberUtils.TikvPodName(tcName, int32(i)),
+			LeaderCount: 1,
+			State:       v1alpha1.TiKVStateUp,
+		}
+	}
+	for i := 0; int32(i) < pdReplicas; i++ {
+		tc.Status.PD.Members[memberUtils.PdPodName(tcName, int32(i))] = v1alpha1.PDMember{
+			Health: true,
+			Name:   memberUtils.PdPodName(tcName, int32(i)),
+		}
+	}
+	return tc
 }
 
 func newNormalPod() *corev1.Pod {

pkg/webhook/pod/tikv_deleter.go

@@ -183,7 +183,7 @@ func (pc *PodAdmissionControl) admitDeleteUpTiKVPod(payload *admitPayload, store
 	}
 
 	if isUpgrading {
-		err = checkFormerTiKVPodStatus(pc.kubeCli, payload.tc, ordinal, *payload.ownerStatefulSet.Spec.Replicas, storesInfo)
+		err = checkFormerTiKVPodStatus(pc.kubeCli, payload.tc, ordinal, payload.ownerStatefulSet, storesInfo)
 		if err != nil {
 			klog.Infof("tc[%s/%s]'s tikv pod[%s/%s] failed to delete,%v", namespace, tcName, namespace, name, err)
 			return util.ARFail(err)

pkg/webhook/pod/tikv_deleter_test.go

@@ -59,7 +59,7 @@ func TestTiKVDeleterDelete(t *testing.T) {
 		t.Log(test.name)
 		deleteTiKVPod := newTiKVPod(1)
 		ownerStatefulSet := newOwnerStatefulsetForTikv()
-		tc := newTidbClusterForPodAdmissionControl()
+		tc := newTidbClusterForPodAdmissionControl(pdReplicas, tikvReplicas)
 		kubeCli := kubefake.NewSimpleClientset()
 
 		podAdmissionControl := newPodAdmissionControl(kubeCli)

pkg/webhook/pod/tikv_util.go

@@ -18,25 +18,28 @@ import (
 	"strings"
 	"time"
 
-	"k8s.io/client-go/kubernetes"
-	"k8s.io/klog"
-
+	"github.com/pingcap/advanced-statefulset/client/apis/apps/v1/helper"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
 	memberUtil "github.com/pingcap/tidb-operator/pkg/manager/member"
 	"github.com/pingcap/tidb-operator/pkg/pdapi"
 	apps "k8s.io/api/apps/v1"
 	core "k8s.io/api/core/v1"
 	meta "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/kubernetes"
+	"k8s.io/klog"
 )
 
 // checkFormerTiKVPodStatus would check all the former tikv pods whether their store state were UP during Upgrading
 // check need both  check former pod is ready ,store up, and no evict leader
-func checkFormerTiKVPodStatus(kubeCli kubernetes.Interface, tc *v1alpha1.TidbCluster, ordinal int32, replicas int32, storesInfo *pdapi.StoresInfo) error {
+func checkFormerTiKVPodStatus(kubeCli kubernetes.Interface, tc *v1alpha1.TidbCluster, ordinal int32, set *apps.StatefulSet, storesInfo *pdapi.StoresInfo) error {
 
 	tcName := tc.Name
 	namespace := tc.Namespace
 
-	for i := replicas - 1; i > ordinal; i-- {
+	for i := range helper.GetPodOrdinals(tc.Spec.TiKV.Replicas, set) {
+		if i <= ordinal {
+			continue
+		}
 		podName := memberUtil.TikvPodName(tcName, i)
 		pod, err := kubeCli.CoreV1().Pods(namespace).Get(podName, meta.GetOptions{})
 		if err != nil {

pkg/webhook/pod/util.go

@@ -19,7 +19,6 @@ import (
 
 	"github.com/pingcap/advanced-statefulset/client/apis/apps/v1/helper"
 	"github.com/pingcap/tidb-operator/pkg/apis/pingcap/v1alpha1"
-	"github.com/pingcap/tidb-operator/pkg/features"
 	"github.com/pingcap/tidb-operator/pkg/label"
 	memberUtil "github.com/pingcap/tidb-operator/pkg/manager/member"
 	"github.com/pingcap/tidb-operator/pkg/pdapi"
@@ -64,7 +63,7 @@ func addDeferDeletingToPVC(pvc *core.PersistentVolumeClaim, kubeCli kubernetes.I
 
 // check whether the former upgraded pd pods were healthy in PD cluster during PD upgrading.
 // If not,then return an error
-func checkFormerPDPodStatus(kubeCli kubernetes.Interface, pdClient pdapi.PDClient, tc *v1alpha1.TidbCluster, namespace string, ordinal int32, replicas int32) error {
+func checkFormerPDPodStatus(kubeCli kubernetes.Interface, pdClient pdapi.PDClient, tc *v1alpha1.TidbCluster, set *apps.StatefulSet, ordinal int32) error {
 	healthInfo, err := pdClient.GetHealth()
 	if err != nil {
 		return err
@@ -73,9 +72,14 @@ func checkFormerPDPodStatus(kubeCli kubernetes.Interface, pdClient pdapi.PDClien
 	for _, memberHealth := range healthInfo.Healths {
 		membersHealthMap[memberHealth.Name] = memberHealth.Health
 	}
+	namespace := tc.Namespace
 
 	tcName := tc.Name
-	for i := replicas - 1; i > ordinal; i-- {
+
+	for i := range helper.GetPodOrdinals(tc.Spec.PD.Replicas, set) {
+		if i <= ordinal {
+			continue
+		}
 		podName := memberUtil.PdPodName(tcName, i)
 		pod, err := kubeCli.CoreV1().Pods(namespace).Get(podName, meta.GetOptions{})
 		if err != nil {
@@ -155,21 +159,9 @@ func checkFormerPodRestartStatus(kubeCli kubernetes.Interface, memberType v1alph
 		return false, nil
 	}
 
-	if features.DefaultFeatureGate.Enabled(features.AdvancedStatefulSet) {
-		for k := range helper.GetPodOrdinals(replicas, payload.ownerStatefulSet) {
-			if k > ordinal {
-				existed, err := f(tc.Name, k, memberType)
-				if err != nil {
-					return false, err
-				}
-				if existed {
-					return true, nil
-				}
-			}
-		}
-	} else {
-		for i := replicas - 1; i > ordinal; i-- {
-			existed, err := f(tc.Name, i, memberType)
+	for k := range helper.GetPodOrdinals(replicas, payload.ownerStatefulSet) {
+		if k > ordinal {
+			existed, err := f(tc.Name, k, memberType)
 			if err != nil {
 				return false, err
 			}
@@ -178,6 +170,7 @@ func checkFormerPodRestartStatus(kubeCli kubernetes.Interface, memberType v1alph
 			}
 		}
 	}
+
 	return false, nil
 }