diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go index 4cce39fa093..ab7c7c5d4b7 100644 --- a/server/cluster/cluster.go +++ b/server/cluster/cluster.go @@ -653,18 +653,6 @@ func (c *RaftCluster) LoadClusterInfo() (*RaftCluster, error) { zap.Int("count", c.GetStoreCount()), zap.Duration("cost", time.Since(start)), ) - - start = time.Now() - - // used to load region from kv storage to cache storage. - if err = storage.TryLoadRegionsOnce(c.ctx, c.storage, c.CheckAndPutRegion); err != nil { - return nil, err - } - log.Info("load regions", - zap.Int("count", c.GetTotalRegionCount()), - zap.Duration("cost", time.Since(start)), - ) - return c, nil } diff --git a/server/server.go b/server/server.go index c79f51d8153..e508e50f500 100644 --- a/server/server.go +++ b/server/server.go @@ -491,6 +491,16 @@ func (s *Server) startServer(ctx context.Context) error { s.gcSafePointManager = gc.NewSafePointManager(s.storage, s.cfg.PDServerCfg) s.basicCluster = core.NewBasicCluster() s.cluster = cluster.NewRaftCluster(ctx, clusterID, s.GetBasicCluster(), s.GetStorage(), syncer.NewRegionSyncer(s), s.client, s.httpClient) + // used to load region from kv storage to cache storage. + start := time.Now() + if err = storage.TryLoadRegionsOnce(ctx, s.GetStorage(), s.cluster.CheckAndPutRegion); err != nil { + return err + } + log.Info("load regions", + zap.Int("count", s.cluster.GetTotalRegionCount()), + zap.Duration("cost", time.Since(start)), + ) + keyspaceIDAllocator := id.NewAllocator(&id.AllocatorParams{ Client: s.client, RootPath: s.rootPath,