[iotdb] branch rel/1.2 updated: [To rel/1.2] Fix confignode restart Error (#10751)

[ta...@apache.org]

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

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


The following commit(s) were added to refs/heads/rel/1.2 by this push:
     new c08129993de [To rel/1.2] Fix confignode restart Error (#10751)
c08129993de is described below

commit c08129993de3534d499490823e252b982a39262d
Author: Potato <ta...@apache.org>
AuthorDate: Tue Aug 1 15:13:29 2023 +0800

    [To rel/1.2] Fix confignode restart Error (#10751)
---
 .../org/apache/iotdb/confignode/manager/load/LoadManager.java |  5 +++++
 .../load/balancer/partition/DataPartitionPolicyTable.java     | 11 ++++++++++-
 .../org/apache/iotdb/confignode/manager/node/NodeManager.java |  3 +++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
index b4c291c97e9..450a19adad2 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
@@ -130,6 +130,11 @@ public class LoadManager {
     return partitionBalancer.allocateDataPartition(unassignedDataPartitionSlotsMap);
   }
 
+  /**
+   * Re-balance the DataPartitionPolicyTable.
+   *
+   * @param database Database name
+   */
   public void reBalanceDataPartitionPolicy(String database) {
     partitionBalancer.reBalanceDataPartitionPolicy(database);
   }
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/DataPartitionPolicyTable.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/DataPartitionPolicyTable.java
index 29bd2a2c1ba..ed297abf4d7 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/DataPartitionPolicyTable.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/DataPartitionPolicyTable.java
@@ -78,6 +78,11 @@ public class DataPartitionPolicyTable {
    * @param dataRegionGroups All DataRegionGroups currently in the Database
    */
   public void reBalanceDataPartitionPolicy(List<TConsensusGroupId> dataRegionGroups) {
+    if (dataRegionGroups.isEmpty()) {
+      // No need to re-balance when there is no DataRegionGroup
+      return;
+    }
+
     dataAllotTableLock.lock();
     try {
       dataRegionGroups.forEach(
@@ -115,12 +120,16 @@ public class DataPartitionPolicyTable {
 
   /** Only use this interface when init PartitionBalancer. */
   public void setDataAllotMap(Map<TSeriesPartitionSlot, TConsensusGroupId> dataAllotMap) {
+    if (seriesPartitionSlotCounter.size() == 0) {
+      // No need to re-balance when there is no DataRegionGroup
+      return;
+    }
     try {
       dataAllotTableLock.lock();
       int mu = SERIES_SLOT_NUM / seriesPartitionSlotCounter.size();
       dataAllotMap.forEach(
           (seriesPartitionSlot, regionGroupId) -> {
-            if (seriesPartitionSlotCounter.get(regionGroupId) < mu) {
+            if (regionGroupId != null && seriesPartitionSlotCounter.get(regionGroupId) < mu) {
               // Put into dataAllotMap only when the number of SeriesSlots
               // allocated to the RegionGroup is less than mu
               this.dataAllotMap.put(seriesPartitionSlot, regionGroupId);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index 55d3ab05345..1ed797f6fdd 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -364,6 +364,9 @@ public class NodeManager {
       UpdateVersionInfoPlan updateConfigNodePlan =
           new UpdateVersionInfoPlan(versionInfo, configNodeId);
       ConsensusWriteResponse result = getConsensusManager().write(updateConfigNodePlan);
+      if (result.getException() != null) {
+        return new TSStatus(TSStatusCode.CONSENSUS_NOT_INITIALIZED.getStatusCode());
+      }
       return result.getStatus();
     }
     return ClusterNodeStartUtils.ACCEPT_NODE_RESTART;