From 2008f2d67e9b2e8a1ab5dc33671893690d37018a Mon Sep 17 00:00:00 2001 From: Ti Chi Robot Date: Tue, 16 Jul 2024 12:46:29 +0800 Subject: [PATCH] *: fix the initialization of encryption key manager (#8383) (#8391) close tikv/pd#8384 Signed-off-by: ti-chi-bot Signed-off-by: Ryan Leung Co-authored-by: Ryan Leung --- server/server.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/server/server.go b/server/server.go index a4ff1405d60..b30173209d3 100644 --- a/server/server.go +++ b/server/server.go @@ -444,6 +444,10 @@ func (s *Server) startServer(ctx context.Context) error { Label: idAllocLabel, Member: s.member.MemberValue(), }) + s.encryptionKeyManager, err = encryption.NewManager(s.client, &s.cfg.Security.Encryption) + if err != nil { + return err + } regionStorage, err := storage.NewStorageWithLevelDBBackend(ctx, filepath.Join(s.cfg.DataDir, "region-meta"), s.encryptionKeyManager) if err != nil { return err @@ -468,11 +472,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)