change log

Signed-off-by: husharp <[email protected]>
tikv · May 10, 2024 · 2433f0c · 2433f0c
1 parent 8d36be5
commit 2433f0c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/pkg/mcs/scheduling/server/server.go b/pkg/mcs/scheduling/server/server.go
@@ -17,7 +17,6 @@ package server
 import (
 	"context"
 	"fmt"
-	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"net/http"
 	"os"
 	"os/signal"
@@ -56,6 +55,7 @@ import (
 	"github.com/tikv/pd/pkg/storage/endpoint"
 	"github.com/tikv/pd/pkg/storage/kv"
 	"github.com/tikv/pd/pkg/utils/apiutil"
+	"github.com/tikv/pd/pkg/utils/etcdutil"
 	"github.com/tikv/pd/pkg/utils/grpcutil"
 	"github.com/tikv/pd/pkg/utils/logutil"
 	"github.com/tikv/pd/pkg/utils/memberutil"
@@ -334,10 +334,10 @@ func (s *Server) campaignLeader() {
 func (s *Server) primaryWatch(ctx context.Context, exitPrimary chan struct{}) {
 	resp, err := etcdutil.EtcdKVGet(s.participant.GetLeadership().GetClient(), s.participant.GetLeaderPath())
 	if err != nil || resp == nil || len(resp.Kvs) == 0 {
-		log.Error("[primary] getting the leader meets error", errs.ZapError(err))
+		log.Error("scheduling primary getting the primary meets error", errs.ZapError(err))
 		return
 	}
-	log.Info("[primary] start to watch the primary", zap.Stringer("scheduling-primary", s.participant.GetLeader()))
+	log.Info("scheduling primary start to watch the primary", zap.Stringer("scheduling-primary", s.participant.GetLeader()))
 	// Watch will keep looping and never return unless the primary has changed.
 	s.participant.GetLeadership().SetLeaderWatch(true)
 	s.participant.GetLeadership().Watch(s.serverLoopCtx, resp.Kvs[0].ModRevision+1)
@@ -346,15 +346,15 @@ func (s *Server) primaryWatch(ctx context.Context, exitPrimary chan struct{}) {
 	// only API update primary will set the expected leader
 	curPrimary, err := etcdutil.GetValue(s.participant.Client(), s.participant.GetLeaderPath())
 	if err != nil {
-		log.Error("[primary] getting the leader meets error", errs.ZapError(err))
+		log.Error("scheduling primary getting the leader meets error", errs.ZapError(err))
 		return
 	}
 	// only trigger by updating primary
 	if curPrimary != nil && resp.Kvs[0].Value != nil && string(curPrimary) != string(resp.Kvs[0].Value) {
 		utils.SetExpectedPrimary(s.participant.Client(), s.participant.GetLeaderPath())
 
 		s.participant.UnsetLeader()
-		defer log.Info("[primary] exit the primary watch loop")
+		defer log.Info("scheduling primary exit the primary watch loop")
 		for {
 			select {
 			case <-ctx.Done():

diff --git a/pkg/mcs/utils/util.go b/pkg/mcs/utils/util.go
@@ -86,8 +86,8 @@ func GetExpectedPrimary(client *clientv3.Client, leaderPath string) string {
 }
 
 // RemoveExpectedPrimary removes the expected primary key.
-// - removed when campaign success
-// - removed when server is closed
+// - removed when campaign new primary success
+// - removed when old primary server is closed
 func RemoveExpectedPrimary(client *clientv3.Client, leaderPath string) {
 	log.Info("remove expected primary key", zap.String("leaderPath", leaderPath))
 	// remove expected leader key
@@ -105,7 +105,7 @@ func SetExpectedPrimary(client *clientv3.Client, leaderPath string) {
 	log.Info("set expected primary key", zap.String("leaderPath", leaderPath))
 	leaderRaw, err := etcdutil.GetValue(client, leaderPath)
 	if err != nil {
-		log.Error("[primary] get primary key error", zap.Error(err))
+		log.Error("get primary key error", zap.Error(err))
 		return
 	}
 	// write a flag to indicate the current primary has exited

diff --git a/pkg/tso/global_allocator.go b/pkg/tso/global_allocator.go
@@ -677,10 +677,10 @@ func (gta *GlobalTSOAllocator) campaignLeader() {
 func (gta *GlobalTSOAllocator) primaryWatch(ctx context.Context, exitPrimary chan struct{}) {
 	resp, err := etcdutil.EtcdKVGet(gta.member.GetLeadership().GetClient(), gta.member.GetLeaderPath())
 	if err != nil || resp == nil || len(resp.Kvs) == 0 {
-		log.Error("[primary] getting the leader meets error", errs.ZapError(err))
+		log.Error("tso primary getting the primary meets error", errs.ZapError(err))
 		return
 	}
-	log.Info("[primary] start to watch the primary",
+	log.Info("tso primary start to watch the primary",
 		logutil.CondUint32("keyspace-group-id", gta.getGroupID(), gta.getGroupID() > 0),
 		zap.String("campaign-tso-primary-name", gta.member.Name()))
 	// Watch will keep looping and never return unless the primary has changed.
@@ -691,18 +691,18 @@ func (gta *GlobalTSOAllocator) primaryWatch(ctx context.Context, exitPrimary cha
 	// only API update primary will set the expected leader
 	curPrimary, err := etcdutil.GetValue(gta.member.Client(), gta.member.GetLeaderPath())
 	if err != nil {
-		log.Error("[primary] getting the leader meets error", errs.ZapError(err))
+		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) {
 		mcsutils.SetExpectedPrimary(gta.member.Client(), gta.member.GetLeaderPath())
 
 		gta.member.UnsetLeader()
+		defer log.Info("tso primary exit the primary watch loop")
 		for {
 			select {
 			case <-ctx.Done():
-				log.Info("[primary] exit the primary watch loop")
 				return
 			case exitPrimary <- struct{}{}:
 				return