fix possible conflix between BGSave and DBSync

konkona · Oct 17, 2017 · 0714609 · 0714609
1 parent e18d821
commit 0714609
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/pika_server.cc b/src/pika_server.cc
@@ -844,6 +844,13 @@ bool PikaServer::InitBgsaveEngine() {
 }
 
 bool PikaServer::RunBgsaveEngine(const std::string path) {
+  // Prepare for Bgsaving
+  if (!InitBgsaveEnv() || !InitBgsaveEngine()) {
+    ClearBgsave();
+    return false;
+  }
+  LOG(INFO) << "after prepare bgsave";
+
   // Backup to tmp dir
   nemo::Status nemo_s = bgsave_engine_->CreateNewBackup(path);
   LOG(INFO) << "Create new backup finished.";
@@ -865,13 +872,6 @@ void PikaServer::Bgsave() {
     bgsave_info_.bgsaving = true;
   }
 
-  // Prepare for Bgsaving
-  if (!InitBgsaveEnv() || !InitBgsaveEngine()) {
-    ClearBgsave();
-    return;
-  }
-  LOG(INFO) << "after prepare bgsave";
-
   // Start new thread if needed
   bgsave_thread_.StartThread();
   bgsave_thread_.Schedule(&DoBgsave, static_cast<void*>(this));