fix listen addr of tso service (#6110)

ref #5836 Signed-off-by: Sen Han <00hnes@gmail.com> Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
tikv · Mar 8, 2023 · 8cd4b16 · 8cd4b16
1 parent 9952911
commit 8cd4b16
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/pkg/mcs/tso/server/config.go b/pkg/mcs/tso/server/config.go
@@ -38,7 +38,7 @@ const (
 
 	defaultName             = "TSO"
 	defaultBackendEndpoints = "http://127.0.0.1:2379"
-	defaultListenAddr       = "127.0.0.1:3379"
+	defaultListenAddr       = "http://127.0.0.1:3379"
 
 	defaultTSOSaveInterval           = time.Duration(utils.DefaultLeaderLease) * time.Second
 	defaultTSOUpdatePhysicalInterval = 50 * time.Millisecond

diff --git a/pkg/mcs/tso/server/server.go b/pkg/mcs/tso/server/server.go
@@ -94,6 +94,7 @@ type Server struct {
 	clusterID   uint64
 	rootPath    string
 	storage     endpoint.TSOStorage
+	listenURL   *url.URL
 	backendUrls []url.URL
 
 	// for the primary election in the TSO cluster
@@ -438,6 +439,11 @@ func checkStream(streamCtx context.Context, cancel context.CancelFunc, done chan
 	<-done
 }
 
+// GetListenURL gets the listen URL.
+func (s *Server) GetListenURL() *url.URL {
+	return s.listenURL
+}
+
 // GetConfig gets the config.
 func (s *Server) GetConfig() *Config {
 	return s.cfg
@@ -579,10 +585,14 @@ func (s *Server) startServer() (err error) {
 	if err != nil {
 		return err
 	}
+	s.listenURL, err = url.Parse(s.cfg.ListenAddr)
+	if err != nil {
+		return err
+	}
 	if tlsConfig != nil {
-		s.muxListener, err = tls.Listen(utils.TCPNetworkStr, s.cfg.ListenAddr, tlsConfig)
+		s.muxListener, err = tls.Listen(utils.TCPNetworkStr, s.listenURL.Host, tlsConfig)
 	} else {
-		s.muxListener, err = net.Listen(utils.TCPNetworkStr, s.cfg.ListenAddr)
+		s.muxListener, err = net.Listen(utils.TCPNetworkStr, s.listenURL.Host)
 	}
 	if err != nil {
 		return err

diff --git a/tests/mcs/tso/server_test.go b/tests/mcs/tso/server_test.go
@@ -90,7 +90,7 @@ func (suite *tsoServerTestSuite) TestTSOServerStartAndStopNormally() {
 	}, testutil.WithWaitFor(5*time.Second), testutil.WithTickInterval(50*time.Millisecond))
 
 	// Test registered GRPC Service
-	cc, err := grpc.DialContext(suite.ctx, s.GetConfig().ListenAddr, grpc.WithInsecure())
+	cc, err := grpc.DialContext(suite.ctx, s.GetListenURL().Host, grpc.WithInsecure())
 	re.NoError(err)
 	cc.Close()
 }

diff --git a/tests/mcs/tso/testutil.go b/tests/mcs/tso/testutil.go
@@ -17,7 +17,6 @@ package tso
 import (
 	"context"
 	"os"
-	"strings"
 	"time"
 
 	"github.com/pingcap/log"
@@ -70,7 +69,7 @@ func startSingleTSOTestServer(ctx context.Context, re *require.Assertions, backe
 	cfg, err := newTSOTestDefaultConfig()
 	re.NoError(err)
 	cfg.BackendEndpoints = backendEndpoints
-	cfg.ListenAddr = strings.TrimPrefix(tempurl.Alloc(), "http://")
+	cfg.ListenAddr = tempurl.Alloc()
 
 	s, cleanup, err := newTSOTestServer(ctx, re, cfg)
 	re.NoError(err)