changed by name

Signed-off-by: husharp <[email protected]>

pkg/election/leadership.go

@@ -397,7 +397,7 @@ func (ls *Leadership) Watch(serverCtx context.Context, revision int64) {
 				// ONLY `/ms/primary/transfer` API update primary will meet this condition.
 				if ev.Type == mvccpb.PUT && ls.IsPrimary() {
 					log.Info("current leadership is updated", zap.Int64("revision", wresp.Header.Revision),
-						zap.String("leader-key", ls.leaderKey), zap.Any("value", ls.leaderValue),
+						zap.String("leader-key", ls.leaderKey), zap.ByteString("cur-value", ev.Kv.Value),
 						zap.String("purpose", ls.purpose))
 					return
 				}

pkg/mcs/discovery/discover.go

@@ -96,14 +96,9 @@ func TransferPrimary(client *clientv3.Client, serviceName, oldPrimary, newPrimar
 	}
 
 	var primaryIDs []string
-	var memberValues []string
 	for _, member := range entries {
 		if (newPrimary == "" && member.ServiceAddr != oldPrimary) || (newPrimary != "" && member.Name == newPrimary) {
 			primaryIDs = append(primaryIDs, member.ServiceAddr)
-			if string(member.MemberValue) == "" {
-				return errors.New(fmt.Sprintf("member %s value is empty", member.Name))
-			}
-			memberValues = append(memberValues, string(member.MemberValue))
 		}
 	}
 	if len(primaryIDs) == 0 {
@@ -137,7 +132,7 @@ func TransferPrimary(client *clientv3.Client, serviceName, oldPrimary, newPrimar
 	}
 	// update primary key to notify old primary server.
 	putResp, err := kv.NewSlowLogTxn(client).
-		Then(clientv3.OpPut(primaryKey, memberValues[nextPrimaryID], clientv3.WithLease(grantResp.ID))).
+		Then(clientv3.OpPut(primaryKey, primaryIDs[nextPrimaryID], clientv3.WithLease(grantResp.ID))).
 		Commit()
 	if err != nil || !putResp.Succeeded {
 		return errors.Errorf("failed to write primary flag for %s, err: %v", serviceName, err)

pkg/mcs/discovery/registry_entry.go

@@ -31,7 +31,6 @@ type ServiceRegistryEntry struct {
 	GitHash        string `json:"git-hash"`
 	DeployPath     string `json:"deploy-path"`
 	StartTimestamp int64  `json:"start-timestamp"`
-	MemberValue    []byte `json:"member-value"`
 }
 
 // Serialize this service registry entry

pkg/mcs/scheduling/server/server.go

@@ -23,6 +23,7 @@ import (
 	"path/filepath"
 	"runtime"
 	"strconv"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"syscall"
@@ -252,7 +253,7 @@ func (s *Server) primaryElectionLoop() {
 		expectedPrimary := utils.AttachExpectedPrimaryFlag(s.GetClient(), s.participant.GetLeaderPath())
 		// skip campaign the primary if the expected primary is not empty and not equal to the current memberValue.
 		// expected primary ONLY SET BY `/ms/primary/transfer` API.
-		if expectedPrimary != "" && expectedPrimary != s.participant.MemberValue() {
+		if expectedPrimary != "" && !strings.Contains(s.participant.MemberValue(), expectedPrimary) {
 			log.Info("skip campaigning of scheduling primary and check later",
 				zap.String("server-name", s.Name()),
 				zap.String("expected-primary-id", expectedPrimary),
@@ -356,7 +357,7 @@ func (s *Server) primaryWatch(ctx context.Context, exitPrimary chan struct{}) {
 		log.Error("scheduling primary getting the leader meets error", errs.ZapError(err))
 		return
 	}
-	if curPrimary != nil && resp.Kvs[0].Value != nil && string(curPrimary) != string(resp.Kvs[0].Value) {
+	if curPrimary != nil && resp.Kvs[0].Value != nil && !strings.Contains(string(resp.Kvs[0].Value), string(curPrimary)) {
 		// 1. modify the expected primary flag to the new primary.
 		utils.MarkExpectedPrimaryFlag(s.participant.Client(), s.participant.GetLeaderPath())
 		// 2. modify memory status.
@@ -503,7 +504,6 @@ func (s *Server) startServer() (err error) {
 		ListenUrls: []string{s.cfg.GetAdvertiseListenAddr()},
 	}
 	s.participant.InitInfo(p, endpoint.SchedulingSvcRootPath(s.clusterID), utils.PrimaryKey, "primary election")
-	s.serviceID.MemberValue = []byte(s.participant.MemberValue())
 
 	s.service = &Service{Server: s}
 	s.AddServiceReadyCallback(s.startCluster)

pkg/mcs/utils/util.go

@@ -107,6 +107,7 @@ func ClearPrimaryExpectationFlag(client *clientv3.Client, leaderPath string) {
 // MarkExpectedPrimaryFlag marks the expected primary flag when the current primary has exited.
 func MarkExpectedPrimaryFlag(client *clientv3.Client, leaderPath string) {
 	log.Info("set expected primary flag", zap.String("leader-path", leaderPath))
+	// We have updated new primary(server's addr) in `leaderPath` by `/ms/primary/transfer` API.
 	leaderRaw, err := etcdutil.GetValue(client, leaderPath)
 	if err != nil {
 		log.Error("get primary key error", zap.Error(err))

pkg/tso/global_allocator.go

@@ -19,6 +19,7 @@ import (
 	"errors"
 	"fmt"
 	"runtime/trace"
+	"strings"
 	"sync"
 	"sync/atomic"
 	"time"
@@ -565,7 +566,7 @@ func (gta *GlobalTSOAllocator) primaryElectionLoop() {
 		expectedPrimary := mcsutils.AttachExpectedPrimaryFlag(gta.member.Client(), gta.member.GetLeaderPath())
 		// skip campaign the primary if the expected primary is not empty and not equal to the current memberValue.
 		// expected primary ONLY SET BY `/ms/primary/transfer` API.
-		if expectedPrimary != "" && expectedPrimary != gta.member.MemberValue() {
+		if expectedPrimary != "" && !strings.Contains(gta.member.MemberValue(), expectedPrimary) {
 			log.Info("skip campaigning of tso primary and check later",
 				zap.String("server-name", gta.member.Name()),
 				zap.String("expected-primary-id", expectedPrimary),
@@ -701,7 +702,7 @@ func (gta *GlobalTSOAllocator) primaryWatch(ctx context.Context, exitPrimary cha
 		log.Error("tso primary getting the leader meets error", errs.ZapError(err))
 		return
 	}
-	if curPrimary != nil && resp.Kvs[0].Value != nil && string(curPrimary) != string(resp.Kvs[0].Value) {
+	if curPrimary != nil && resp.Kvs[0].Value != nil && !strings.Contains(string(resp.Kvs[0].Value), string(curPrimary)) {
 		// 1. modify the expected primary flag to the new primary.
 		mcsutils.MarkExpectedPrimaryFlag(gta.member.Client(), gta.member.GetLeaderPath())
 		// 2. modify memory status.

pkg/tso/keyspace_group_manager.go

@@ -737,7 +737,6 @@ func (kgm *KeyspaceGroupManager) updateKeyspaceGroup(group *endpoint.KeyspaceGro
 		ListenUrls: []string{kgm.cfg.GetAdvertiseListenAddr()},
 	}
 	participant.InitInfo(p, endpoint.KeyspaceGroupsElectionPath(kgm.tsoSvcRootPath, group.ID), mcsutils.PrimaryKey, "keyspace group primary election")
-	kgm.tsoServiceID.MemberValue = []byte(participant.MemberValue())
 	// If the keyspace group is in split, we should ensure that the primary elected by the new keyspace group
 	// is always on the same TSO Server node as the primary of the old keyspace group, and this constraint cannot
 	// be broken until the entire split process is completed.