address comments

Signed-off-by: lhy1024 <[email protected]>
lhy1024 · Sep 11, 2023 · 31d5fb4 · 31d5fb4
1 parent 5e1e5f5
commit 31d5fb4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/pkg/member/participant.go b/pkg/member/participant.go
@@ -385,14 +385,14 @@ func (m *Participant) SetCampaignChecker(checker leadershipCheckFunc) {
 }
 
 // NewParticipantByService creates a new participant by service name.
-func NewParticipantByService(serviceName string) (leader participant) {
+func NewParticipantByService(serviceName string) (p participant) {
 	switch serviceName {
 	case utils.TSOServiceName:
-		leader = &tsopb.Participant{}
+		p = &tsopb.Participant{}
 	case utils.SchedulingServiceName:
-		leader = &schedulingpb.Participant{}
+		p = &schedulingpb.Participant{}
 	case utils.ResourceManagerServiceName:
-		leader = &resource_manager.Participant{}
+		p = &resource_manager.Participant{}
 	}
-	return leader
+	return p
 }
diff --git a/server/server.go b/server/server.go
@@ -618,9 +618,7 @@ func (s *Server) startServerLoop(ctx context.Context) {
 	go s.encryptionKeyManagerLoop()
 	if s.IsAPIServiceMode() {
 		s.initTSOPrimaryWatcher()
-		s.tsoPrimaryWatcher.StartWatchLoop()
 		s.initSchedulingPrimaryWatcher()
-		s.schedulingPrimaryWatcher.StartWatchLoop()
 	}
 }
 
@@ -1954,12 +1952,14 @@ func (s *Server) initTSOPrimaryWatcher() {
 	tsoRootPath := endpoint.TSOSvcRootPath(s.clusterID)
 	tsoServicePrimaryKey := endpoint.KeyspaceGroupPrimaryPath(tsoRootPath, mcs.DefaultKeyspaceGroupID)
 	s.tsoPrimaryWatcher = s.initServicePrimaryWatcher(serviceName, tsoServicePrimaryKey)
+	s.tsoPrimaryWatcher.StartWatchLoop()
 }
 
 func (s *Server) initSchedulingPrimaryWatcher() {
 	serviceName := mcs.SchedulingServiceName
 	primaryKey := endpoint.SchedulingPrimaryPath(s.clusterID)
 	s.schedulingPrimaryWatcher = s.initServicePrimaryWatcher(serviceName, primaryKey)
+	s.schedulingPrimaryWatcher.StartWatchLoop()
 }
 
 func (s *Server) initServicePrimaryWatcher(serviceName string, primaryKey string) *etcdutil.LoopWatcher {