server: fix the data race problem (#3772) (#3774)

Signed-off-by: Ryan Leung <rleungx@gmail.com> Co-authored-by: Ryan Leung <rleungx@gmail.com>
tikv · Jun 25, 2021 · 08369e5 · 08369e5
1 parent 53b7a3e
commit 08369e5
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/server/server.go b/server/server.go
@@ -1247,6 +1247,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
@@ -1258,10 +1263,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