mcs: fix tso server address compare (#8289)

close #8284 Signed-off-by: lhy1024 <[email protected]>
tikv · Jun 24, 2024 · 0ec084b · 0ec084b
1 parent 26e90e9
commit 0ec084b
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 15 deletions.
diff --git a/pkg/keyspace/tso_keyspace_group.go b/pkg/keyspace/tso_keyspace_group.go
@@ -876,7 +876,7 @@ func (m *GroupManager) SetPriorityForKeyspaceGroup(id uint32, node string, prior
 		inKeyspaceGroup := false
 		members := make([]endpoint.KeyspaceGroupMember, 0, len(kg.Members))
 		for _, member := range kg.Members {
-			if member.CompareAddress(node) {
+			if member.IsAddressEquivalent(node) {
 				inKeyspaceGroup = true
 				member.Priority = priority
 			}

diff --git a/pkg/mcs/tso/server/grpc_service.go b/pkg/mcs/tso/server/grpc_service.go
@@ -19,7 +19,6 @@ import (
 	"io"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	"github.com/pingcap/errors"
@@ -164,7 +163,7 @@ func (s *Service) FindGroupByKeyspaceID(
 			Address: member.Address,
 			// TODO: watch the keyspace groups' primary serving address changes
 			// to get the latest primary serving addresses of all keyspace groups.
-			IsPrimary: strings.EqualFold(member.Address, am.GetLeaderAddr()),
+			IsPrimary: member.IsAddressEquivalent(am.GetLeaderAddr()),
 		})
 	}
 

diff --git a/pkg/storage/endpoint/tso_keyspace_group.go b/pkg/storage/endpoint/tso_keyspace_group.go
@@ -81,11 +81,11 @@ type KeyspaceGroupMember struct {
 	Priority int    `json:"priority"`
 }
 
-// CompareAddress compares the address with the given address.
+// IsAddressEquivalent compares the address with the given address.
 // It compares the address without the scheme.
 // Otherwise, it will not work when we update the scheme from http to https.
 // Issue: https://github.com/tikv/pd/issues/8284
-func (m *KeyspaceGroupMember) CompareAddress(addr string) bool {
+func (m *KeyspaceGroupMember) IsAddressEquivalent(addr string) bool {
 	return typeutil.EqualBaseURLs(m.Address, addr)
 }
 

diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go
@@ -290,7 +290,7 @@ func (s *state) getNextPrimaryToReset(
 				if member.Priority > maxPriority {
 					maxPriority = member.Priority
 				}
-				if member.CompareAddress(localAddress) {
+				if member.IsAddressEquivalent(localAddress) {
 					localPriority = member.Priority
 				}
 			}
@@ -625,7 +625,7 @@ func (kgm *KeyspaceGroupManager) primaryPriorityCheckLoop() {
 			if member != nil {
 				aliveTSONodes := make(map[string]struct{})
 				kgm.tsoNodes.Range(func(key, _ any) bool {
-					aliveTSONodes[key.(string)] = struct{}{}
+					aliveTSONodes[typeutil.TrimScheme(key.(string))] = struct{}{}
 					return true
 				})
 				if len(aliveTSONodes) == 0 {
@@ -638,7 +638,7 @@ func (kgm *KeyspaceGroupManager) primaryPriorityCheckLoop() {
 					if member.Priority <= localPriority {
 						continue
 					}
-					if _, ok := aliveTSONodes[member.Address]; ok {
+					if _, ok := aliveTSONodes[typeutil.TrimScheme(member.Address)]; ok {
 						resetLeader = true
 						break
 					}
@@ -667,7 +667,7 @@ func (kgm *KeyspaceGroupManager) primaryPriorityCheckLoop() {
 
 func (kgm *KeyspaceGroupManager) isAssignedToMe(group *endpoint.KeyspaceGroup) bool {
 	return slice.AnyOf(group.Members, func(i int) bool {
-		return group.Members[i].CompareAddress(kgm.tsoServiceID.ServiceAddr)
+		return group.Members[i].IsAddressEquivalent(kgm.tsoServiceID.ServiceAddr)
 	})
 }
 

diff --git a/pkg/tso/keyspace_group_manager_test.go b/pkg/tso/keyspace_group_manager_test.go
@@ -891,7 +891,7 @@ func collectAssignedKeyspaceGroupIDs(re *require.Assertions, kgm *KeyspaceGroupM
 				re.Equal(i, int(am.kgID))
 				re.Equal(i, int(kg.ID))
 				for _, m := range kg.Members {
-					if m.CompareAddress(kgm.tsoServiceID.ServiceAddr) {
+					if m.IsAddressEquivalent(kgm.tsoServiceID.ServiceAddr) {
 						ids = append(ids, uint32(i))
 						break
 					}

diff --git a/pkg/utils/typeutil/comparison.go b/pkg/utils/typeutil/comparison.go
@@ -82,8 +82,10 @@ func Float64Equal(a, b float64) bool {
 
 // EqualBaseURLs compares two URLs without scheme.
 func EqualBaseURLs(url1, url2 string) bool {
-	trimScheme := func(s string) string {
-		return strings.TrimPrefix(strings.TrimPrefix(s, "https://"), "http://")
-	}
-	return trimScheme(url1) == trimScheme(url2)
+	return TrimScheme(url1) == TrimScheme(url2)
+}
+
+// TrimScheme trims the scheme from the URL.
+func TrimScheme(s string) string {
+	return strings.TrimPrefix(strings.TrimPrefix(s, "https://"), "http://")
 }
diff --git a/server/apiv2/handlers/tso_keyspace_group.go b/server/apiv2/handlers/tso_keyspace_group.go
@@ -515,7 +515,7 @@ func SetPriorityForKeyspaceGroup(c *gin.Context) {
 	// check if node exists
 	members := kg.Members
 	if slice.NoneOf(members, func(i int) bool {
-		return members[i].CompareAddress(node)
+		return members[i].IsAddressEquivalent(node)
 	}) {
 		c.AbortWithStatusJSON(http.StatusBadRequest, "tso node does not exist in the keyspace group")
 	}