[iotdb] branch multileader_restart_test updated: fix restart.

[xingtanzjr]

This is an automated email from the ASF dual-hosted git repository.

xingtanzjr pushed a commit to branch multileader_restart_test
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/multileader_restart_test by 
this push:
     new b4c67c2d1c fix restart.
     new be2c7f359d Merge branch 'fix/mutilleader_restart' into 
multileader_restart_test
b4c67c2d1c is described below

commit b4c67c2d1cc10403473473686d2f7f07dfb881d1
Author: stormbroken <181250...@smail.nju.edu.cn>
AuthorDate: Wed Jul 6 14:50:07 2022 +0800

    fix restart.
---
 .../iotdb/consensus/multileader/logdispatcher/IndexController.java     | 3 ---
 .../iotdb/consensus/multileader/logdispatcher/LogDispatcher.java       | 2 +-
 server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java         | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git 
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
 
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
index 064f6841e0..026b196ec9 100644
--- 
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
+++ 
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/IndexController.java
@@ -19,8 +19,6 @@
 
 package org.apache.iotdb.consensus.multileader.logdispatcher;
 
-import org.apache.iotdb.commons.utils.TestOnly;
-
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,7 +90,6 @@ public class IndexController {
     }
   }
 
-  @TestOnly
   public long getLastFlushedIndex() {
     return lastFlushedIndex;
   }
diff --git 
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
 
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
index ae60598061..b26ec2e18e 100644
--- 
a/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
+++ 
b/consensus/src/main/java/org/apache/iotdb/consensus/multileader/logdispatcher/LogDispatcher.java
@@ -156,7 +156,7 @@ public class LogDispatcher {
     }
 
     public long getCurrentSyncIndex() {
-      return controller.getCurrentIndex();
+      return controller.getLastFlushedIndex();
     }
 
     public Peer getPeer() {
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java 
b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
index 1709ee22ec..cecdb43fd9 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
@@ -692,7 +692,7 @@ public class WALNode implements IWALNode {
       if (needUpdatingFilesToSearch || filesToSearch == null) {
         updateFilesToSearch();
         if (needUpdatingFilesToSearch) {
-          logger.warn("update file to search failed");
+          logger.warn("update file to search index = {} failed.", 
nextSearchIndex);
           return false;
         }
       }