fix leader will try to send snapshot by mistake (vesoft-inc#2150)

only clean wal after part started rebased Co-authored-by: bright-starry-sky <[email protected]>
nildot · Jun 4, 2020 · 9384dee · 9384dee
1 parent 6cf1cbc
commit 9384dee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/kvstore/NebulaStore.cpp b/src/kvstore/NebulaStore.cpp
@@ -13,6 +13,7 @@
 #include "fs/FileUtils.h"
 #include "kvstore/RocksEngine.h"
 #include "kvstore/SnapshotManagerImpl.h"
+#include <folly/ScopeGuard.h>
 
 DEFINE_string(engine_type, "rocksdb", "rocksdb, memory...");
 DEFINE_int32(custom_filter_interval_secs, 24 * 3600, "interval to trigger custom compaction");
@@ -824,6 +825,11 @@ bool NebulaStore::checkLeader(std::shared_ptr<Part> part) const {
 }
 
 void NebulaStore::cleanWAL() {
+    SCOPE_EXIT {
+        bgWorkers_->addDelayTask(FLAGS_clean_wal_interval_secs * 1000,
+                                 &NebulaStore::cleanWAL,
+                                 this);
+    };
     for (const auto& spaceEntry : spaces_) {
         for (const auto& engine : spaceEntry.second->engines_) {
             engine->flush();

diff --git a/src/kvstore/raftex/Host.cpp b/src/kvstore/raftex/Host.cpp
@@ -119,7 +119,6 @@ folly::Future<cpp2::AppendLogResponse> Host::appendLogs(
 
         if (requestOnGoing_ && res == cpp2::ErrorCode::SUCCEEDED) {
             if (cachingPromise_.size() <= FLAGS_max_outstanding_requests) {
-                logIdToSend_ = logId;
                 pendingReq_ = std::make_tuple(term,
                                               logId,
                                               committedLogId);

diff --git a/src/kvstore/raftex/RaftPart.cpp b/src/kvstore/raftex/RaftPart.cpp
@@ -1254,7 +1254,7 @@ void RaftPart::cleanupSnapshot() {
 
 bool RaftPart::needToCleanWal() {
     std::lock_guard<std::mutex> g(raftLock_);
-    if (status_ == Status::WAITING_SNAPSHOT) {
+    if (status_ == Status::STARTING || status_ == Status::WAITING_SNAPSHOT) {
         return false;
     }
     for (auto& host : hosts_) {