address comments

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Feb 24, 2023 · b7e7ebb · b7e7ebb
1 parent 05ff21e
commit b7e7ebb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/pkg/mcs/resource_manager/server/server.go b/pkg/mcs/resource_manager/server/server.go
@@ -50,6 +50,7 @@ const (
 	defaultGRPCGracefulStopTimeout = 5 * time.Second
 	// defaultHTTPGracefulShutdownTimeout is the default timeout to wait for http server to gracefully shutdown
 	defaultHTTPGracefulShutdownTimeout = 5 * time.Second
+	defaultLeaseInSeconds              = 3
 )
 
 // Server is the resource manager server, and it implements bs.Server.
@@ -279,8 +280,7 @@ func (s *Server) startServer() error {
 
 	// Server has started.
 	atomic.StoreInt64(&s.isServing, 1)
-	// register to etcd
-	s.serviceRegister = discovery.NewServiceRegister(s.ctx, s.etcdClient, "resource_manager", s.cfg.ListenAddr, s.cfg.ListenAddr, 3)
+	s.serviceRegister = discovery.NewServiceRegister(s.ctx, s.etcdClient, "resource_manager", s.cfg.ListenAddr, s.cfg.ListenAddr, defaultLeaseInSeconds)
 	s.serviceRegister.Register()
 	return nil
 }

diff --git a/tests/mcs/resource_manager/server_test.go b/tests/mcs/resource_manager/server_test.go
@@ -49,7 +49,7 @@ func TestResourceManagerServer(t *testing.T) {
 
 	cfg := rm.NewConfig()
 	cfg.BackendEndpoints = leader.GetAddr()
-	cfg.ListenAddr = "127.0.0.1:8086"
+	cfg.ListenAddr = "127.0.0.1:0"
 
 	svr := rm.NewServer(ctx, cfg)
 	go svr.Run()
@@ -119,7 +119,7 @@ func TestResourceManagerRegister(t *testing.T) {
 
 	cfg := rm.NewConfig()
 	cfg.BackendEndpoints = leader.GetAddr()
-	cfg.ListenAddr = "127.0.0.1:8087"
+	cfg.ListenAddr = "127.0.0.1:0"
 
 	svr := rm.NewServer(ctx, cfg)
 	go svr.Run()