From a2bcc991154e41e5647f12b79eaea5afb4d27e8c Mon Sep 17 00:00:00 2001 From: Ryan Leung Date: Tue, 9 Jul 2024 17:40:33 +0800 Subject: [PATCH] This is an automated cherry-pick of #8383 close tikv/pd#8384 Signed-off-by: ti-chi-bot --- server/server.go | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/server/server.go b/server/server.go index a4ff1405d60..197035cae4d 100644 --- a/server/server.go +++ b/server/server.go @@ -444,7 +444,21 @@ func (s *Server) startServer(ctx context.Context) error { Label: idAllocLabel, Member: s.member.MemberValue(), }) +<<<<<<< HEAD regionStorage, err := storage.NewStorageWithLevelDBBackend(ctx, filepath.Join(s.cfg.DataDir, "region-meta"), s.encryptionKeyManager) +======= + s.encryptionKeyManager, err = encryption.NewManager(s.client, &s.cfg.Security.Encryption) + if err != nil { + return err + } + // Initialize an etcd storage as the default storage. + defaultStorage := storage.NewStorageWithEtcdBackend(s.client, s.rootPath) + // Initialize a specialized LevelDB storage to store the region-related meta info independently. + regionStorage, err := storage.NewRegionStorageWithLevelDBBackend( + ctx, + filepath.Join(s.cfg.DataDir, "region-meta"), + s.encryptionKeyManager) +>>>>>>> c50993b2f (*: fix the initialization of encryption key manager (#8383)) if err != nil { return err } @@ -468,11 +482,6 @@ func (s *Server) startServer(ctx context.Context) error { } } - s.encryptionKeyManager, err = encryption.NewManager(s.client, &s.cfg.Security.Encryption) - if err != nil { - return err - } - s.gcSafePointManager = gc.NewSafePointManager(s.storage, s.cfg.PDServerCfg) s.basicCluster = core.NewBasicCluster() s.cluster = cluster.NewRaftCluster(ctx, s.clusterID, syncer.NewRegionSyncer(s), s.client, s.httpClient)