From 2d6f5704e2e9766b14fda35f6457adb50d89c83e Mon Sep 17 00:00:00 2001
From: okJiang <819421878@qq.com>
Date: Tue, 31 Dec 2024 11:53:26 +0800
Subject: [PATCH 1/2] retry checkServiceModeChanged to make tso client work
 normal

Signed-off-by: okJiang <819421878@qq.com>
---
 client/servicediscovery/pd_service_discovery.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/servicediscovery/pd_service_discovery.go b/client/servicediscovery/pd_service_discovery.go
index 5530f3cfa9b..bba846be11e 100644
--- a/client/servicediscovery/pd_service_discovery.go
+++ b/client/servicediscovery/pd_service_discovery.go
@@ -509,8 +509,8 @@ func (c *pdServiceDiscovery) Init() error {
 		}
 	}
 
-	if err := c.checkServiceModeChanged(); err != nil {
-		log.Warn("[pd] failed to check service mode and will check later", zap.Error(err))
+	if err := c.initRetry(c.checkServiceModeChanged); err != nil {
+		return err
 	}
 
 	c.wg.Add(3)

From 81261bdc9ce9334acf2d3358c5b6aa8b65112d0b Mon Sep 17 00:00:00 2001
From: okJiang <819421878@qq.com>
Date: Thu, 2 Jan 2025 17:14:31 +0800
Subject: [PATCH 2/2] add cancel

Signed-off-by: okJiang <819421878@qq.com>
---
 client/servicediscovery/pd_service_discovery.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/servicediscovery/pd_service_discovery.go b/client/servicediscovery/pd_service_discovery.go
index bba846be11e..931f950c6d1 100644
--- a/client/servicediscovery/pd_service_discovery.go
+++ b/client/servicediscovery/pd_service_discovery.go
@@ -510,6 +510,7 @@ func (c *pdServiceDiscovery) Init() error {
 	}
 
 	if err := c.initRetry(c.checkServiceModeChanged); err != nil {
+		c.cancel()
 		return err
 	}