Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -401,12 +401,7 @@ public DataSet getSystemConfiguration() {
public DataSet registerDataNode(TDataNodeRegisterReq req) {
TSStatus status = confirmLeader();
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
status =
ClusterNodeStartUtils.confirmNodeRegistration(
NodeType.DataNode,
req.getClusterName(),
req.getDataNodeConfiguration().getLocation(),
this);
status = ClusterNodeStartUtils.confirmDataNodeRegistration(req, this);
if (!req.isPreCheck() && status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return nodeManager.registerDataNode(req);
}
Expand Down Expand Up @@ -1211,12 +1206,7 @@ public TConfigNodeRegisterResp registerConfigNode(TConfigNodeRegisterReq req) {
// Make sure the global configurations are consist
status = checkConfigNodeGlobalConfig(req);
if (status == null) {
status =
ClusterNodeStartUtils.confirmNodeRegistration(
NodeType.ConfigNode,
req.getClusterParameters().getClusterName(),
req.getConfigNodeLocation(),
this);
status = ClusterNodeStartUtils.confirmConfigNodeRegistration(req, this);
if (status.getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return nodeManager.registerConfigNode(req);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRegisterReq;
import org.apache.iotdb.confignode.rpc.thrift.TDataNodeRegisterReq;
import org.apache.iotdb.rpc.TSStatusCode;

import java.util.ArrayList;
Expand All @@ -54,11 +56,8 @@ private ClusterNodeStartUtils() {
// Empty constructor
}

public static TSStatus confirmNodeRegistration(
NodeType nodeType, String clusterName, Object nodeLocation, ConfigManager configManager) {
private static TSStatus confirmClusterName(NodeType nodeType, String clusterName) {
TSStatus status = new TSStatus();

/* Reject start if the cluster name is error */
if (!CLUSTER_NAME.equals(clusterName)) {
status.setCode(TSStatusCode.REJECT_NODE_START.getStatusCode());
status.setMessage(
Expand All @@ -76,46 +75,28 @@ public static TSStatus confirmNodeRegistration(
CommonConfig.SYSTEM_CONFIG_NAME));
return status;
}
return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
}

/* Check if there exist conflict TEndPoints */
List<TEndPoint> conflictEndPoints = null;
switch (nodeType) {
case ConfigNode:
if (nodeLocation instanceof TConfigNodeLocation) {
conflictEndPoints =
checkConflictTEndPointForNewConfigNode(
(TConfigNodeLocation) nodeLocation,
configManager.getNodeManager().getRegisteredConfigNodes());
}
break;
case DataNode:
default:
if (nodeLocation instanceof TDataNodeLocation) {
conflictEndPoints =
checkConflictTEndPointForNewDataNode(
(TDataNodeLocation) nodeLocation,
configManager.getNodeManager().getRegisteredDataNodes());
}
break;
}

if (conflictEndPoints != null && !conflictEndPoints.isEmpty()) {
/* Reject Node registration because there exist conflict TEndPoints */
status.setCode(TSStatusCode.REJECT_NODE_START.getStatusCode());
status.setMessage(
String.format(
"Reject %s registration. Because the following ip:port: %s of the current %s is conflicted with other registered Nodes in the cluster."
+ POSSIBLE_SOLUTIONS
+ "\t1. Use SQL: \"show cluster details\" to find out the conflict Nodes. Remove them and retry start."
+ "\n\t2. Change the conflict ip:port configurations in %s file and retry start.",
nodeType.getNodeType(),
conflictEndPoints,
nodeType.getNodeType(),
CommonConfig.SYSTEM_CONFIG_NAME));
return status;
}
private static TSStatus rejectRegistrationBecauseConflictEndPoints(
NodeType nodeType, List<TEndPoint> conflictEndPoints) {
TSStatus status = new TSStatus();
status.setCode(TSStatusCode.REJECT_NODE_START.getStatusCode());
status.setMessage(
String.format(
"Reject %s registration. Because the following ip:port: %s of the current %s is conflicted with other registered Nodes in the cluster."
+ POSSIBLE_SOLUTIONS
+ "\t1. Use SQL: \"show cluster details\" to find out the conflict Nodes. Remove them and retry start."
+ "\n\t2. Change the conflict ip:port configurations in %s file and retry start.",
nodeType.getNodeType(),
conflictEndPoints,
nodeType.getNodeType(),
CommonConfig.SYSTEM_CONFIG_NAME));
return status;
}

// Check cluster id
public static TSStatus confirmClusterId(ConfigManager configManager) {
TSStatus status = new TSStatus();
final String clusterId =
configManager
.getClusterManager()
Expand All @@ -124,11 +105,57 @@ public static TSStatus confirmNodeRegistration(
if (clusterId == null) {
status
.setCode(TSStatusCode.GET_CLUSTER_ID_ERROR.getStatusCode())
.setMessage("clusterId has not generated, please try again later");
.setMessage("cluster id has not generated, please try again later");
return status;
}
return new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode());
}

public static TSStatus confirmDataNodeRegistration(
TDataNodeRegisterReq req, ConfigManager configManager) {
// Confirm cluster name
TSStatus status = confirmClusterName(NodeType.DataNode, req.getClusterName());
if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return status;
}
// Confirm end point conflicts
List<TEndPoint> conflictEndPoints =
checkConflictTEndPointForNewDataNode(
req.getDataNodeConfiguration().getLocation(),
configManager.getNodeManager().getRegisteredDataNodes());
if (!conflictEndPoints.isEmpty()) {
return rejectRegistrationBecauseConflictEndPoints(NodeType.DataNode, conflictEndPoints);
}
// Confirm whether cluster id has been generated
status = confirmClusterId(configManager);
if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return status;
}
// Success
return ACCEPT_NODE_REGISTRATION;
}

/* Accept registration if all TEndPoints aren't conflict */
public static TSStatus confirmConfigNodeRegistration(
TConfigNodeRegisterReq req, ConfigManager configManager) {
// Confirm cluster name
TSStatus status =
confirmClusterName(NodeType.ConfigNode, req.getClusterParameters().getClusterName());
if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return status;
}
// Confirm end point conflicts
List<TEndPoint> conflictEndPoints =
checkConflictTEndPointForNewConfigNode(
req.getConfigNodeLocation(), configManager.getNodeManager().getRegisteredConfigNodes());
if (!conflictEndPoints.isEmpty()) {
return rejectRegistrationBecauseConflictEndPoints(NodeType.ConfigNode, conflictEndPoints);
}
// Confirm whether cluster id has been generated
status = confirmClusterId(configManager);
if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
return status;
}
// Success
return ACCEPT_NODE_REGISTRATION;
}

Expand Down