From 7c867432cc117f7866c5e4fd29267cef5b7b33d2 Mon Sep 17 00:00:00 2001
From: Tian Jiang <jt2594838@163.com>
Date: Mon, 28 Aug 2023 11:44:07 +0800
Subject: [PATCH] fix configuration

---
 .../confignode/manager/load/cache/route/RegionRouteCache.java   | 2 ++
 .../src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java | 1 +
 .../org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java  | 1 +
 .../apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java    | 1 +
 4 files changed, 5 insertions(+)

diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/route/RegionRouteCache.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/route/RegionRouteCache.java
index 02d82a3433..f0b5a5c03f 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/route/RegionRouteCache.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/cache/route/RegionRouteCache.java
@@ -74,6 +74,7 @@ public class RegionRouteCache {
     switch (consensusProtocolClass) {
       case ConsensusFactory.SIMPLE_CONSENSUS:
       case ConsensusFactory.RATIS_CONSENSUS:
+      case ConsensusFactory.RAFT_CONSENSUS:
         // The leader of simple and ratis consensus is self-elected
         if (leaderSample.getLeft() > this.leaderSample.get().getLeft()) {
           this.leaderSample.set(leaderSample);
@@ -95,6 +96,7 @@ public class RegionRouteCache {
     switch (consensusProtocolClass) {
       case ConsensusFactory.SIMPLE_CONSENSUS:
       case ConsensusFactory.RATIS_CONSENSUS:
+      case ConsensusFactory.RAFT_CONSENSUS:
         // The leader of simple and ratis consensus is self-elected
         if (leaderSample.get().getRight() != leaderId.get()) {
           leaderId.set(leaderSample.get().getRight());
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index b7d532a425..7bd4e5510f 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -1061,6 +1061,7 @@ public class IoTDBDescriptor {
             "datanode_schema_cache_eviction_policy", conf.getDataNodeSchemaCacheEvictionPolicy()));
 
     loadIoTConsensusProps(properties);
+    conf.setCustomizedProperties(properties);
   }
 
   private void loadIoTConsensusProps(Properties properties) {
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
index b3b50a2216..c9582c99e1 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
@@ -183,6 +183,7 @@ public class DataRegionConsensusImpl {
                                             CONF.getConnectionTimeoutInMS(), TimeUnit.MILLISECONDS))
                                     .build())
                             .build())
+                    .setProperties(CONF.getCustomizedProperties())
                     .build(),
                 DataRegionConsensusImplHolder::createDataRegionStateMachine)
             .orElseThrow(
diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
index ca1b8a564e..bf112ac30e 100644
--- a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
+++ b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
@@ -141,6 +141,7 @@ public class SchemaRegionConsensusImpl {
                                     .build())
                             .build())
                     .setStorageDir(CONF.getSchemaRegionConsensusDir())
+                    .setProperties(CONF.getCustomizedProperties())
                     .build(),
                 gid ->
                     new SchemaRegionStateMachine(
-- 
GitLab