fix

Signed-off-by: Ryan Leung <rleungx@gmail.com>

pkg/keyspace/keyspace_test.go

@@ -38,9 +38,11 @@ import (
 )
 
 const (
-	testConfig  = "test config"
-	testConfig1 = "config_entry_1"
-	testConfig2 = "config_entry_2"
+	testConfig   = "test config"
+	testConfig1  = "config_entry_1"
+	testConfig2  = "config_entry_2"
+	testGroupID  = "tso_keyspace_group_id"
+	testUserKind = "user_kind"
 )
 
 type keyspaceTestSuite struct {
@@ -109,8 +111,10 @@ func makeCreateKeyspaceRequests(count int) []*CreateKeyspaceRequest {
 		requests[i] = &CreateKeyspaceRequest{
 			Name: fmt.Sprintf("test_keyspace_%d", i),
 			Config: map[string]string{
-				testConfig1: "100",
-				testConfig2: "200",
+				testConfig1:  "100",
+				testConfig2:  "200",
+				testGroupID:  "0",
+				testUserKind: "basic",
 			},
 			CreateTime: now,
 			IsPreAlloc: true, // skip wait region split

server/cluster/cluster.go

@@ -375,9 +375,11 @@ func (c *RaftCluster) Start(s Server, bootstrap bool) (err error) {
 
 	// bootstrap keyspace group manager after starting other parts successfully.
 	// This order avoids a stuck goroutine in keyspaceGroupManager when it fails to create raftcluster.
-	err = c.keyspaceGroupManager.Bootstrap(c.ctx)
-	if err != nil {
-		return err
+	if c.keyspaceGroupManager != nil {
+		err = c.keyspaceGroupManager.Bootstrap(c.ctx)
+		if err != nil {
+			return err
+		}
 	}
 
 	c.checkSchedulingService()

server/server.go

@@ -238,7 +238,7 @@ type HandlerBuilder func(context.Context, *Server) (http.Handler, apiutil.APISer
 
 // CreateServer creates the UNINITIALIZED pd server with given configuration.
 func CreateServer(ctx context.Context, cfg *config.Config, legacyServiceBuilders ...HandlerBuilder) (*Server, error) {
-	// TODO: Currently, we have following combinations:
+	// TODO: Currently, we have following combinations for tso:
 	//
 	// There could be the following scenarios for non-serverless:
 	// 1. microservice + single timelines
@@ -535,7 +535,9 @@ func (s *Server) Close() {
 	s.cgMonitor.StopMonitor()
 
 	s.stopServerLoop()
-	s.keyspaceGroupManager.Close()
+	if s.keyspaceGroupManager != nil {
+		s.keyspaceGroupManager.Close()
+	}
 
 	if s.client != nil {
 		if err := s.client.Close(); err != nil {