IoTConsensusV2: Fix up iotv2 wal check (#14280)

apache · Dec 3, 2024 · a409dab · a409dab
1 parent 2b4ab69
commit a409dab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/...ore/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/...ore/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -153,7 +153,7 @@ private void checkGlobalConfig() throws ConfigurationException {
           String.valueOf(CONF.getSchemaRegionConsensusProtocolClass()),
           String.format(
               "%s or %s", ConsensusFactory.SIMPLE_CONSENSUS, ConsensusFactory.RATIS_CONSENSUS),
-          "the SchemaRegion doesn't support org.apache.iotdb.consensus.iot.FastIoTConsensus");
+          "the SchemaRegion doesn't support org.apache.iotdb.consensus.iot.IoTConsensusV2");
     }
 
     // The leader distribution policy is limited

diff --git a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
@@ -218,12 +218,15 @@ public void checkSystemConfig() throws ConfigurationException, IOException {
 
     if (systemPropertiesHandler.isFirstStart()) {
       if ((config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)
-              || config
-                  .getDataRegionConsensusProtocolClass()
-                  .equals(ConsensusFactory.IOT_CONSENSUS_V2))
+              || (config
+                      .getDataRegionConsensusProtocolClass()
+                      .equals(ConsensusFactory.IOT_CONSENSUS_V2)
+                  && config
+                      .getIotConsensusV2Mode()
+                      .equals(ConsensusFactory.IOT_CONSENSUS_V2_STREAM_MODE)))
           && config.getWalMode().equals(WALMode.DISABLE)) {
         throw new ConfigurationException(
-            "Configuring the WALMode as disable is not supported under IoTConsensus");
+            "Configuring the WALMode as disable is not supported under IoTConsensus and IoTConsensusV2 stream mode");
       }
     } else {
       // check whether upgrading from <=v0.9