Merge branch 'master' into introduce-backoffer

rleungx · Dec 2, 2024 · 6e6ecb3 · 6e6ecb3
2 parents c0b7765 + a86f3dd
commit 6e6ecb3
Show file tree

Hide file tree

Showing 31 changed files with 104 additions and 914 deletions.
diff --git a/pkg/mcs/tso/server/apis/v1/api.go b/pkg/mcs/tso/server/apis/v1/api.go
@@ -302,19 +302,14 @@ func transferPrimary(c *gin.Context) {
 		return
 	}
 
-	globalAllocator, err := allocator.GetAllocator(tso.GlobalDCLocation)
-	if err != nil {
-		c.AbortWithStatusJSON(http.StatusInternalServerError, err.Error())
-		return
-	}
 	// only members of specific group are valid primary candidates.
 	group := svr.GetKeyspaceGroupManager().GetKeyspaceGroups()[keyspaceGroupID]
 	memberMap := make(map[string]bool, len(group.Members))
 	for _, member := range group.Members {
 		memberMap[member.Address] = true
 	}
 
-	if err := utils.TransferPrimary(svr.GetClient(), globalAllocator.(*tso.GlobalTSOAllocator).GetExpectedPrimaryLease(),
+	if err := utils.TransferPrimary(svr.GetClient(), allocator.GetAllocator().(*tso.GlobalTSOAllocator).GetExpectedPrimaryLease(),
 		constant.TSOServiceName, svr.Name(), newPrimary, keyspaceGroupID, memberMap); err != nil {
 		c.AbortWithStatusJSON(http.StatusInternalServerError, err.Error())
 		return

diff --git a/pkg/mcs/tso/server/config.go b/pkg/mcs/tso/server/config.go
@@ -127,11 +127,6 @@ func (c *Config) GetLeaderLease() int64 {
 	return c.LeaderLease
 }
 
-// IsLocalTSOEnabled returns if the local TSO is enabled.
-func (c *Config) IsLocalTSOEnabled() bool {
-	return c.EnableLocalTSO
-}
-
 // GetTSOUpdatePhysicalInterval returns TSO update physical interval.
 func (c *Config) GetTSOUpdatePhysicalInterval() time.Duration {
 	return c.TSOUpdatePhysicalInterval.Duration

diff --git a/pkg/mcs/tso/server/grpc_service.go b/pkg/mcs/tso/server/grpc_service.go
@@ -111,12 +111,11 @@ func (s *Service) Tso(stream tsopb.TSO_TsoServer) error {
 		}
 		keyspaceID := header.GetKeyspaceId()
 		keyspaceGroupID := header.GetKeyspaceGroupId()
-		dcLocation := request.GetDcLocation()
 		count := request.GetCount()
 		ts, keyspaceGroupBelongTo, err := s.keyspaceGroupManager.HandleTSORequest(
 			ctx,
 			keyspaceID, keyspaceGroupID,
-			dcLocation, count)
+			count)
 		if err != nil {
 			return status.Error(codes.Unknown, err.Error())
 		}
@@ -198,7 +197,7 @@ func (s *Service) GetMinTS(
 		}, nil
 	}
 
-	minTS, kgAskedCount, kgTotalCount, err := s.keyspaceGroupManager.GetMinTS(request.GetDcLocation())
+	minTS, kgAskedCount, kgTotalCount, err := s.keyspaceGroupManager.GetMinTS()
 	if err != nil {
 		return &tsopb.GetMinTSResponse{
 			Header: wrapErrorToHeader(

diff --git a/pkg/mcs/tso/server/server.go b/pkg/mcs/tso/server/server.go
@@ -328,10 +328,7 @@ func (s *Server) ResetTS(ts uint64, ignoreSmaller, skipUpperBoundCheck bool, key
 		log.Error("failed to get allocator manager", errs.ZapError(err))
 		return err
 	}
-	tsoAllocator, err := tsoAllocatorManager.GetAllocator(tso.GlobalDCLocation)
-	if err != nil {
-		return err
-	}
+	tsoAllocator := tsoAllocatorManager.GetAllocator()
 	if tsoAllocator == nil {
 		return errs.ErrServerNotStarted
 	}

diff --git a/pkg/member/member.go b/pkg/member/member.go
@@ -383,16 +383,6 @@ func (m *EmbeddedEtcdMember) getMemberLeaderPriorityPath(id uint64) string {
 	return path.Join(m.rootPath, fmt.Sprintf("member/%d/leader_priority", id))
 }
 
-// GetDCLocationPathPrefix returns the dc-location path prefix of the cluster.
-func (*EmbeddedEtcdMember) GetDCLocationPathPrefix() string {
-	return keypath.Prefix(keypath.DCLocationPath(nil, 0))
-}
-
-// GetDCLocationPath returns the dc-location path of a member with the given member ID.
-func (*EmbeddedEtcdMember) GetDCLocationPath(id uint64) string {
-	return keypath.DCLocationPath(nil, id)
-}
-
 // SetMemberLeaderPriority saves a member's priority to be elected as the etcd leader.
 func (m *EmbeddedEtcdMember) SetMemberLeaderPriority(id uint64, priority int) error {
 	key := m.getMemberLeaderPriorityPath(id)
@@ -421,20 +411,6 @@ func (m *EmbeddedEtcdMember) DeleteMemberLeaderPriority(id uint64) error {
 	return nil
 }
 
-// DeleteMemberDCLocationInfo removes a member's dc-location info.
-func (m *EmbeddedEtcdMember) DeleteMemberDCLocationInfo(id uint64) error {
-	key := m.GetDCLocationPath(id)
-	res, err := m.leadership.LeaderTxn().Then(clientv3.OpDelete(key)).Commit()
-	if err != nil {
-		return errs.ErrEtcdTxnInternal.Wrap(err).GenWithStackByCause()
-	}
-	if !res.Succeeded {
-		log.Error("delete dc-location info failed, maybe not pd leader")
-		return errs.ErrEtcdTxnConflict.FastGenByArgs()
-	}
-	return nil
-}
-
 // GetMemberLeaderPriority loads a member's priority to be elected as the etcd leader.
 func (m *EmbeddedEtcdMember) GetMemberLeaderPriority(id uint64) (int, error) {
 	key := m.getMemberLeaderPriorityPath(id)

diff --git a/pkg/member/participant.go b/pkg/member/participant.go
@@ -276,16 +276,6 @@ func (m *Participant) IsSameLeader(leader participant) bool {
 	return leader.GetId() == m.ID()
 }
 
-// GetDCLocationPathPrefix returns the dc-location path prefix of the cluster.
-func (m *Participant) GetDCLocationPathPrefix() string {
-	return keypath.Prefix(keypath.DCLocationPath(&m.MsParam, 0))
-}
-
-// GetDCLocationPath returns the dc-location path of a member with the given member ID.
-func (m *Participant) GetDCLocationPath(id uint64) string {
-	return keypath.DCLocationPath(&m.MsParam, id)
-}
-
 func (m *Participant) campaignCheck() bool {
 	checker := m.campaignChecker.Load()
 	if checker == nil {