try fix a dead lock

vesoft-inc · Apr 1, 2022 · 8ef6ec9 · 8ef6ec9
1 parent 329cbd0
commit 8ef6ec9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/kvstore/raftex/RaftPart.cpp b/src/kvstore/raftex/RaftPart.cpp
@@ -222,7 +222,6 @@ class AppendLogsIteratorFactory {
           }
 
           // if we try to read a key, in any range
-          // for (auto& [begin, end] : ranges) {
           for (auto& it : ranges) {
             auto* begin = it.first.c_str();
             auto* end = it.second.c_str();
@@ -1052,13 +1051,12 @@ void RaftPart::processAppendLogResponses(const AppendLogResponses& resps,
           replicatingLogs_ = false;
           return;
         }
-        auto firstId = lastLogId_ + 1;
-        AppendLogsIterator it(firstId, currTerm, std::move(sendingLogs_));
-        this->appendLogsInternal(std::move(it), currTerm);
       }
-
-      return;
     }
+    auto firstId = lastLogId_ + 1;
+    AppendLogsIterator it(firstId, currTerm, std::move(sendingLogs_));
+    this->appendLogsInternal(std::move(it), currTerm);
+    return;
   } else {
     // Not enough hosts accepted the log, re-try
     VLOG_EVERY_N(2, 1000) << idStr_ << "Only " << numSucceeded

diff --git a/src/storage/test/ChainAddEdgesTest.cpp b/src/storage/test/ChainAddEdgesTest.cpp
@@ -23,7 +23,6 @@
 namespace nebula {
 namespace storage {
 
-/*
 constexpr int32_t mockSpaceId = 1;
 constexpr int32_t mockPartNum = 1;
 constexpr int32_t fackTerm = 1;
@@ -195,7 +194,6 @@ TEST(ChainAddEdgesTest, processRemoteTest) {
   auto reversedRequest = proc->reverseRequestForward(req);
   delete proc;
 }
-*/
 
 }  // namespace storage
 }  // namespace nebula