fix the data race problem

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · Jun 15, 2021 · 52711fb · 52711fb
1 parent 69209e0
commit 52711fb
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/server/server.go b/server/server.go
@@ -1239,6 +1239,11 @@ func (s *Server) campaignLeader() {
 		return
 	}
 
+	if err := s.persistOptions.LoadTTLFromEtcd(s.ctx, s.client); err != nil {
+		log.Error("failed to load persistOptions from etcd", errs.ZapError(err))
+		return
+	}
+
 	if err := s.encryptionKeyManager.SetLeadership(s.member.GetLeadership()); err != nil {
 		log.Error("failed to initialize encryption", errs.ZapError(err))
 		return
@@ -1250,10 +1255,6 @@ func (s *Server) campaignLeader() {
 		return
 	}
 	defer s.stopRaftCluster()
-	if err := s.persistOptions.LoadTTLFromEtcd(s.ctx, s.client); err != nil {
-		log.Error("failed to load persistOptions from etcd", errs.ZapError(err))
-		return
-	}
 	if err := s.idAllocator.Rebase(); err != nil {
 		log.Error("failed to sync id from etcd", errs.ZapError(err))
 		return