ms: use PDMSName as the transfer primary param (#6294)

Author: bufferflies

pkg/controller/pd_control.go

@@ -133,7 +133,7 @@ func NewFakePDClientForMember(pdControl *pdapi.FakePDControl, tc *v1alpha1.TidbC
 
 // NewFakePDMSClient creates a fake pdmsclient that is set as the pdms client
 func NewFakePDMSClient(pdControl *pdapi.FakePDControl, tc *v1alpha1.TidbCluster, curService string) *pdapi.FakePDMSClient {
-	pdmsClient := pdapi.NewFakePDMSClient()
+	pdmsClient := pdapi.NewFakePDMSClient(tc.Spec.ClusterDomain)
 	if tc.Spec.Cluster != nil {
 		pdControl.SetPDMSClientWithClusterDomain(pdapi.Namespace(tc.Spec.Cluster.Namespace), tc.Spec.Cluster.Name, tc.Spec.Cluster.ClusterDomain, curService, pdmsClient)
 	}

pkg/manager/member/pd_ms_upgrader.go

@@ -194,12 +194,12 @@ func choosePDMSToTransferFromMembers(tc *v1alpha1.TidbCluster, newSet *apps.Stat
 	// just using pods index for now. TODO: add healthy checker for pdms.
 	// find the maximum ordinal which is larger than ordinal
 	if len(list) > int(ordinal)+1 {
-		targetName = PDMSPodName(tcName, list[len(list)-1], controller.PDMSTrimName(newSet.Name))
+		targetName = PDMSName(tcName, list[len(list)-1], tc.Namespace, tc.Spec.ClusterDomain, tc.Spec.AcrossK8s, controller.PDMSTrimName(newSet.Name))
 	}
 
 	if targetName == "" && ordinal != 0 {
 		// find the minimum ordinal which is less than ordinal
-		targetName = PDMSPodName(tcName, list[0], controller.PDMSTrimName(newSet.Name))
+		targetName = PDMSName(tcName, list[0], tc.Namespace, tc.Spec.ClusterDomain, tc.Spec.AcrossK8s, controller.PDMSTrimName(newSet.Name))
 	}
 
 	klog.Infof("Tidbcluster: [%s/%s]' pdms upgrader: choose pdms to transfer primary from members, targetName: %s", ns, tcName, targetName)

pkg/manager/member/pd_ms_upgrader_test.go

@@ -307,6 +307,7 @@ func newTidbClusterForPDMSUpgrader() *v1alpha1.TidbCluster {
 					StorageClassName: pointer.StringPtr("my-storage-class"),
 				},
 			},
+			ClusterDomain: "cluster.local",
 		},
 		Status: v1alpha1.TidbClusterStatus{
 			PDMS: map[string]*v1alpha1.PDMSStatus{

pkg/manager/member/utils.go

@@ -162,7 +162,7 @@ func PdName(tcName string, ordinal int32, namespace string, clusterDomain string
 // See the start script of PDMS in pkg/manager/member/startscript/v2.renderPDMSStartScript
 func PDMSName(tcName string, ordinal int32, namespace, clusterDomain string, acrossK8s bool, component string) string {
 	if len(clusterDomain) > 0 {
-		return fmt.Sprintf("%s.%s-%s-peer.%s.svc.%s", PDMSPodName(tcName, ordinal, component), component, tcName, namespace, clusterDomain)
+		return fmt.Sprintf("%s.%s-%s-peer.%s.svc.%s", PDMSPodName(tcName, ordinal, component), tcName, component, namespace, clusterDomain)
 	}
 
 	// clusterDomain is not set

pkg/pdapi/fake_pdapi.go

@@ -15,6 +15,7 @@ package pdapi
 
 import (
 	"fmt"
+	"strings"
 
 	"github.com/pingcap/kvproto/pkg/metapb"
 	"github.com/pingcap/kvproto/pkg/pdpb"
@@ -316,10 +317,11 @@ func (c *FakePDClient) GetReady() (bool, error) {
 // FakePDMSClient implements a fake version of PDMSClient.
 type FakePDMSClient struct {
 	reactions map[ActionType]Reaction
+	domain    string
 }
 
-func NewFakePDMSClient() *FakePDMSClient {
-	return &FakePDMSClient{reactions: map[ActionType]Reaction{}}
+func NewFakePDMSClient(domain string) *FakePDMSClient {
+	return &FakePDMSClient{reactions: map[ActionType]Reaction{}, domain: domain}
 }
 
 func (c *FakePDMSClient) AddReaction(actionType ActionType, reaction Reaction) {
@@ -346,6 +348,9 @@ func (c *FakePDMSClient) GetHealth() error {
 
 func (c *FakePDMSClient) TransferPrimary(newPrimary string) error {
 	action := &Action{Name: newPrimary}
+	if len(c.domain) > 0 && !strings.Contains(newPrimary, c.domain) {
+		return fmt.Errorf("new primary %s does not contain domain %s", newPrimary, c.domain)
+	}
 	_, err := c.fakeAPI(PDMSTransferPrimaryActionType, action)
 	return err
 }