From f0753d06137607e4861e91bd01607ba088739c3f Mon Sep 17 00:00:00 2001
From: JmPotato <ghzpotato@gmail.com>
Date: Tue, 21 Jan 2025 12:09:10 +0800
Subject: [PATCH] Shorter the namings

Signed-off-by: JmPotato <ghzpotato@gmail.com>
---
 client/servicediscovery/callbacks.go         |  6 +++---
 client/servicediscovery/service_discovery.go | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/client/servicediscovery/callbacks.go b/client/servicediscovery/callbacks.go
index 74cef823457..392810c2ab3 100644
--- a/client/servicediscovery/callbacks.go
+++ b/client/servicediscovery/callbacks.go
@@ -59,7 +59,7 @@ func (c *serviceCallbacks) addServiceURLsSwitchedCallback(cb func()) {
 	c.membersChangedCbs = append(c.membersChangedCbs, cb)
 }
 
-func (c *serviceCallbacks) callServiceModeUpdateCallback(mode pdpb.ServiceMode) {
+func (c *serviceCallbacks) onServiceModeUpdate(mode pdpb.ServiceMode) {
 	c.RLock()
 	cb := c.serviceModeUpdateCb
 	c.RUnlock()
@@ -70,7 +70,7 @@ func (c *serviceCallbacks) callServiceModeUpdateCallback(mode pdpb.ServiceMode)
 	cb(mode)
 }
 
-func (c *serviceCallbacks) callLeaderSwitchedCallbacks(leader string) error {
+func (c *serviceCallbacks) onLeaderSwitched(leader string) error {
 	c.RLock()
 	cbs := make([]leaderSwitchedCallbackFunc, len(c.leaderSwitchedCbs))
 	copy(cbs, c.leaderSwitchedCbs)
@@ -89,7 +89,7 @@ func (c *serviceCallbacks) callLeaderSwitchedCallbacks(leader string) error {
 	return nil
 }
 
-func (c *serviceCallbacks) callMembersChangedCallbacks() {
+func (c *serviceCallbacks) onMembersChanged() {
 	c.RLock()
 	cbs := make([]func(), len(c.membersChangedCbs))
 	copy(cbs, c.membersChangedCbs)
diff --git a/client/servicediscovery/service_discovery.go b/client/servicediscovery/service_discovery.go
index a867111617f..50693ff58fa 100644
--- a/client/servicediscovery/service_discovery.go
+++ b/client/servicediscovery/service_discovery.go
@@ -555,7 +555,7 @@ func (c *serviceDiscovery) updateServiceModeLoop() {
 		failpoint.Return()
 	})
 	failpoint.Inject("usePDServiceMode", func() {
-		c.callbacks.callServiceModeUpdateCallback(pdpb.ServiceMode_PD_SVC_MODE)
+		c.callbacks.onServiceModeUpdate(pdpb.ServiceMode_PD_SVC_MODE)
 		failpoint.Return()
 	})
 
@@ -854,7 +854,7 @@ func (c *serviceDiscovery) checkServiceModeChanged() error {
 			// If the method is not supported, we set it to pd mode.
 			// TODO: it's a hack way to solve the compatibility issue.
 			// we need to remove this after all maintained version supports the method.
-			c.callbacks.callServiceModeUpdateCallback(pdpb.ServiceMode_PD_SVC_MODE)
+			c.callbacks.onServiceModeUpdate(pdpb.ServiceMode_PD_SVC_MODE)
 			return nil
 		}
 		return err
@@ -862,7 +862,7 @@ func (c *serviceDiscovery) checkServiceModeChanged() error {
 	if clusterInfo == nil || len(clusterInfo.ServiceModes) == 0 {
 		return errors.WithStack(errs.ErrNoServiceModeReturned)
 	}
-	c.callbacks.callServiceModeUpdateCallback(clusterInfo.ServiceModes[0])
+	c.callbacks.onServiceModeUpdate(clusterInfo.ServiceModes[0])
 	return nil
 }
 
@@ -951,7 +951,7 @@ func (c *serviceDiscovery) updateURLs(members []*pdpb.Member) {
 	}
 	c.urls.Store(urls)
 	// Run callbacks to reflect the membership changes in the leader and followers.
-	c.callbacks.callMembersChangedCallbacks()
+	c.callbacks.onMembersChanged()
 	log.Info("[pd] update member urls", zap.Strings("old-urls", oldURLs), zap.Strings("new-urls", urls))
 }
 
@@ -961,18 +961,18 @@ func (c *serviceDiscovery) switchLeader(url string) (bool, error) {
 		return false, nil
 	}
 
-	newConn, _ := c.GetOrCreateGRPCConn(url)
+	newConn, err := c.GetOrCreateGRPCConn(url)
 	// If gRPC connect is created successfully or leader is new, still saves.
 	if url != oldLeader.GetURL() || newConn != nil {
 		leaderClient := newPDServiceClient(url, url, newConn, true)
 		c.leader.Store(leaderClient)
 	}
 	// Run callbacks
-	if err := c.callbacks.callLeaderSwitchedCallbacks(url); err != nil {
+	if err := c.callbacks.onLeaderSwitched(url); err != nil {
 		return true, err
 	}
 	log.Info("[pd] switch leader", zap.String("new-leader", url), zap.String("old-leader", oldLeader.GetURL()))
-	return true, nil
+	return true, err
 }
 
 func (c *serviceDiscovery) updateFollowers(members []*pdpb.Member, leaderID uint64, leaderURL string) (changed bool) {