fix unstable problem for link Wal file (vesoft-inc#1391)

zuojihong · Dec 9, 2019 · 5da9299 · 5da9299
1 parent fef7ce8
commit 5da9299
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/kvstore/wal/FileBasedWal.cpp b/src/kvstore/wal/FileBasedWal.cpp
@@ -598,8 +598,8 @@ bool FileBasedWal::linkCurrentWAL(const char* newPath) {
     closeCurrFile();
     std::lock_guard<std::mutex> g(walFilesMutex_);
     if (walFiles_.empty()) {
-        LOG(INFO) << idStr_ << "Create link failed, there is no wal files!";
-        return false;
+        LOG(INFO) << idStr_ << "No wal files found, skip link";
+        return true;
     }
     if (!fs::FileUtils::makeDir(newPath)) {
         LOG(INFO) << idStr_ << "Link file parent dir make failed : " << newPath;

diff --git a/src/meta/processors/admin/AdminClient.cpp b/src/meta/processors/admin/AdminClient.cpp
@@ -575,9 +575,14 @@ folly::Future<Status> AdminClient::createSnapshot(GraphSpaceID spaceId, const st
 
     folly::Promise<Status> pro;
     auto f = pro.getFuture();
+
+    /**
+     * Don't need retry.
+     * Because existing checkpoint directories leads to fail again.
+     **/
     getResponse(allHosts, 0, std::move(req), [] (auto client, auto request) {
         return client->future_createCheckpoint(request);
-    }, 0, std::move(pro), 1 /*The snapshot operation only needs to be retried twice*/);
+    }, 0, std::move(pro), 0);
     return f;
 }