(iotdb) branch master updated: Forcibly take snapshot when upgrade procedure WAL (#12252)

[tanxinyu]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new db9530568d3 Forcibly take snapshot when upgrade procedure WAL (#12252)
db9530568d3 is described below

commit db9530568d382b0221544d606d04621ff8be9b57
Author: Li Yu Heng <liyuheng55...@126.com>
AuthorDate: Fri Mar 29 14:35:11 2024 +0800

    Forcibly take snapshot when upgrade procedure WAL (#12252)
---
 .../apache/iotdb/confignode/manager/consensus/ConsensusManager.java   | 3 +--
 .../confignode/procedure/UpgradeFromWALToConsensusLayerTest.java      | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
index ded9896121d..be7e97eeb47 100644
--- 
a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
+++ 
b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/consensus/ConsensusManager.java
@@ -145,7 +145,6 @@ public class ConsensusManager {
                                   RatisConfig.Snapshot.newBuilder()
                                       .setAutoTriggerThreshold(
                                           
CONF.getConfigNodeRatisSnapshotTriggerThreshold())
-                                      .setCreationGap(1)
                                       .build())
                               .setLog(
                                   RatisConfig.Log.newBuilder()
@@ -436,6 +435,6 @@ public class ConsensusManager {
   }
 
   public void manuallyTakeSnapshot() throws ConsensusException {
-    consensusImpl.triggerSnapshot(ConfigNodeInfo.CONFIG_REGION_ID, false);
+    consensusImpl.triggerSnapshot(ConfigNodeInfo.CONFIG_REGION_ID, true);
   }
 }
diff --git 
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/UpgradeFromWALToConsensusLayerTest.java
 
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/UpgradeFromWALToConsensusLayerTest.java
index 0907fcadec0..35d08059b91 100644
--- 
a/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/UpgradeFromWALToConsensusLayerTest.java
+++ 
b/iotdb-core/confignode/src/test/java/org/apache/iotdb/confignode/procedure/UpgradeFromWALToConsensusLayerTest.java
@@ -72,7 +72,7 @@ public class UpgradeFromWALToConsensusLayerTest {
 
   /**
    * This test will fully start the ConfigManager, generating some files that 
cannot be cleaned up,
-   * which will affect other tests. Therefore, this test is not enabled by 
default
+   * which will affect other tests. Therefore, this test is not enabled by 
default.
    */
   @Ignore
   @Test
@@ -83,7 +83,7 @@ public class UpgradeFromWALToConsensusLayerTest {
     conf.setInternalAddress("127.0.0.1");
     configManager.initConsensusManager();
 
-    // write some raft log to increase index, otherwise cannot take snapshot
+    // write some raft logs to increase index, otherwise cannot take snapshot
     configManager.getConsensusManager().write(new TestOnlyPlan());
     configManager.getConsensusManager().write(new TestOnlyPlan());
     configManager.getConsensusManager().write(new TestOnlyPlan());