You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ta...@apache.org on 2023/10/11 01:32:18 UTC
[iotdb] branch master updated: [IOTDB-6185] Fix show cluster null status bug (#11273)
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 f22baa079c0 [IOTDB-6185] Fix show cluster null status bug (#11273)
f22baa079c0 is described below
commit f22baa079c0f0ce5eaba15e3ccd566b52fa85cf1
Author: Yongzao <53...@qq.com>
AuthorDate: Wed Oct 11 09:32:11 2023 +0800
[IOTDB-6185] Fix show cluster null status bug (#11273)
---
.../org/apache/iotdb/confignode/manager/ConfigManager.java | 12 +++++++++++-
.../apache/iotdb/confignode/manager/node/NodeManager.java | 9 +++++++++
.../procedure/impl/node/AddConfigNodeProcedure.java | 9 +++++++++
3 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index 5ea820f5e3c..70acd3acefd 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -446,8 +446,18 @@ public class ConfigManager implements IManager {
.map(TDataNodeConfiguration::getLocation)
.sorted(Comparator.comparingInt(TDataNodeLocation::getDataNodeId))
.collect(Collectors.toList());
- Map<Integer, String> nodeStatus = getLoadManager().getNodeStatusWithReason();
Map<Integer, TNodeVersionInfo> nodeVersionInfo = getNodeManager().getNodeVersionInfo();
+ Map<Integer, String> nodeStatus = getLoadManager().getNodeStatusWithReason();
+ for (TConfigNodeLocation configNodeLocation : configNodeLocations) {
+ if (!nodeStatus.containsKey(configNodeLocation.getConfigNodeId())) {
+ nodeStatus.put(configNodeLocation.getConfigNodeId(), NodeStatus.Unknown.toString());
+ }
+ }
+ for (TDataNodeLocation dataNodeLocation : dataNodeInfoLocations) {
+ if (!nodeStatus.containsKey(dataNodeLocation.getDataNodeId())) {
+ nodeStatus.put(dataNodeLocation.getDataNodeId(), NodeStatus.Unknown.toString());
+ }
+ }
return new TShowClusterResp(
status, configNodeLocations, dataNodeInfoLocations, nodeStatus, nodeVersionInfo);
} else {
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 bd718527c7b..ba0875dc768 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
@@ -26,6 +26,7 @@ import org.apache.iotdb.common.rpc.thrift.TFlushReq;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.cluster.NodeType;
import org.apache.iotdb.commons.cluster.RegionRoleType;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
@@ -55,6 +56,7 @@ import org.apache.iotdb.confignode.manager.UDFManager;
import org.apache.iotdb.confignode.manager.consensus.ConsensusManager;
import org.apache.iotdb.confignode.manager.load.LoadManager;
import org.apache.iotdb.confignode.manager.load.cache.node.ConfigNodeHeartbeatCache;
+import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
import org.apache.iotdb.confignode.manager.partition.PartitionManager;
import org.apache.iotdb.confignode.manager.partition.PartitionMetrics;
import org.apache.iotdb.confignode.manager.pipe.PipeManager;
@@ -262,6 +264,13 @@ public class NodeManager {
LOGGER.warn(CONSENSUS_WRITE_ERROR, e);
}
+ // Init HeartbeatCache
+ getLoadManager()
+ .forceUpdateNodeCache(
+ NodeType.DataNode,
+ dataNodeId,
+ NodeHeartbeatSample.generateDefaultSample(NodeStatus.Unknown));
+
// update datanode's versionInfo
UpdateVersionInfoPlan updateVersionInfoPlan =
new UpdateVersionInfoPlan(req.getVersionInfo(), dataNodeId);
diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
index f14cc0870c1..01c7d82ec62 100644
--- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
+++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/node/AddConfigNodeProcedure.java
@@ -20,8 +20,11 @@
package org.apache.iotdb.confignode.procedure.impl.node;
import org.apache.iotdb.common.rpc.thrift.TConfigNodeLocation;
+import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.cluster.NodeType;
import org.apache.iotdb.commons.exception.runtime.ThriftSerDeException;
import org.apache.iotdb.commons.utils.ThriftConfigNodeSerDeUtils;
+import org.apache.iotdb.confignode.manager.load.cache.node.NodeHeartbeatSample;
import org.apache.iotdb.confignode.procedure.env.ConfigNodeProcedureEnv;
import org.apache.iotdb.confignode.procedure.exception.ProcedureException;
import org.apache.iotdb.confignode.procedure.state.AddConfigNodeState;
@@ -83,6 +86,12 @@ public class AddConfigNodeProcedure extends AbstractNodeProcedure<AddConfigNodeS
env.notifyRegisterSuccess(tConfigNodeLocation);
env.applyConfigNode(tConfigNodeLocation, versionInfo);
env.broadCastTheLatestConfigNodeGroup();
+ env.getConfigManager()
+ .getLoadManager()
+ .forceUpdateNodeCache(
+ NodeType.ConfigNode,
+ tConfigNodeLocation.getConfigNodeId(),
+ NodeHeartbeatSample.generateDefaultSample(NodeStatus.Unknown));
LOG.info("The ConfigNode: {} is successfully added to the cluster", tConfigNodeLocation);
return Flow.NO_MORE_STATE;
}