fixed bug for cleanup() override

vesoft-inc · Jun 22, 2021 · 4677c6f · 4677c6f
1 parent 39456ad
commit 4677c6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/kvstore/Listener.cpp b/src/kvstore/Listener.cpp
@@ -251,9 +251,11 @@ std::pair<int64_t, int64_t> Listener::commitSnapshot(const std::vector<std::stri
 void Listener::resetListener() {
     std::lock_guard<std::mutex> g(raftLock_);
     reset();
-    leaderCommitId_ = proposedTerm_ = lastLogTerm_ = term_ = lastApplyLogId_ = 0;
-    lastApplyTime_ = 0;
-    persist(0, 0, 0);
+    VLOG(3) << folly::sformat("The listener has been reset : leaderCommitId={},"
+                              "proposedTerm={}, lastLogTerm={}, term={},"
+                              "lastApplyLogId={}",
+                              leaderCommitId_, proposedTerm_, lastLogTerm_,
+                              term_, lastApplyLogId_);
 }
 
 bool Listener::pursueLeaderDone() {

diff --git a/src/kvstore/Listener.h b/src/kvstore/Listener.h
@@ -111,6 +111,7 @@ class Listener : public raftex::RaftPart {
     }
 
     void cleanup() override {
+        CHECK(!raftLock_.try_lock());
         leaderCommitId_ = 0;
         lastApplyLogId_ = 0;
         persist(0, 0, lastApplyLogId_);

diff --git a/src/kvstore/plugins/elasticsearch/ESListener.h b/src/kvstore/plugins/elasticsearch/ESListener.h
@@ -47,9 +47,6 @@ class ESListener : public Listener {
 
     LogID lastApplyLogId() override;
 
-    void cleanup() override {
-    }
-
 private:
     bool writeAppliedId(LogID lastId, TermID lastTerm, LogID lastApplyLogId);