*: fix the initialization of encryption key manager (tikv#8383) (tikv…

…#8392) close tikv#8384 Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: Ryan Leung <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
ti-chi-bot · Jul 25, 2024 · 2fa8cd0 · 2fa8cd0
1 parent f1a9096
commit 2fa8cd0
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/server/server.go b/server/server.go
@@ -453,6 +453,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
+	}
 	// 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.
@@ -482,11 +486,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, clusterID, s.GetBasicCluster(), s.GetStorage(), syncer.NewRegionSyncer(s), s.client, s.httpClient)