[iotdb] branch rel/1.0 updated: [To rel/1.0] fix purge param in RatisConsensus (#8354)

[tanxinyu]

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

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


The following commit(s) were added to refs/heads/rel/1.0 by this push:
     new fbd6ae38f0 [To rel/1.0] fix purge param in RatisConsensus (#8354)
fbd6ae38f0 is described below

commit fbd6ae38f0d467bad2dd8928e191bc57617807bb
Author: William Song <48054931+szywill...@users.noreply.github.com>
AuthorDate: Tue Dec 6 20:45:42 2022 +0800

    [To rel/1.0] fix purge param in RatisConsensus (#8354)
    
    * fix ratis log purge preservation error
    
    * fix ratis log purge preservation error
---
 .../main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java | 2 ++
 .../main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index 25f1ab4b91..a0c2b6d3e0 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -123,6 +123,8 @@ public class ConsensusManager {
                                       .setSegmentCacheSizeMax(
                                           SizeInBytes.valueOf(
                                               
CONF.getConfigNodeRatisLogSegmentSizeMax()))
+                                      .setPreserveNumsWhenPurge(
+                                          
CONF.getConfigNodeRatisPreserveLogsWhenPurge())
                                       .build())
                               .setGrpc(
                                   RatisConfig.Grpc.newBuilder()
diff --git 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index 3db0434a6a..0026de9710 100644
--- 
a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++ 
b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -203,7 +203,7 @@ public class NodeManager {
     
ratisConfig.setSchemaInitialSleepTime(conf.getSchemaRegionRatisInitialSleepTimeMs());
     
ratisConfig.setSchemaMaxSleepTime(conf.getSchemaRegionRatisMaxSleepTimeMs());
 
-    
ratisConfig.setSchemaPreserveWhenPurge(conf.getConfigNodeRatisPreserveLogsWhenPurge());
+    
ratisConfig.setSchemaPreserveWhenPurge(conf.getSchemaRegionRatisPreserveLogsWhenPurge());
     
ratisConfig.setDataPreserveWhenPurge(conf.getDataRegionRatisPreserveLogsWhenPurge());
 
     
ratisConfig.setFirstElectionTimeoutMin(conf.getRatisFirstElectionTimeoutMinMs());