This is an automated email from the ASF dual-hosted git repository.
gosonzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 47efde7781 [INLONG-11313][Manager] Dataproxy cluster increases maximum
packet length configuration (#11314)
47efde7781 is described below
commit 47efde7781df011499bb6b7de21d67ea793bcc62
Author: fuweng11 <[email protected]>
AuthorDate: Thu Oct 10 08:57:45 2024 +0800
[INLONG-11313][Manager] Dataproxy cluster increases maximum packet length
configuration (#11314)
---
.../inlong/common/pojo/dataproxy/DataProxyNodeInfo.java | 6 ++++++
.../pojo/cluster/dataproxy/DataProxyClusterDTO.java | 4 ++++
.../pojo/cluster/dataproxy/DataProxyClusterInfo.java | 3 +++
.../pojo/cluster/dataproxy/DataProxyClusterRequest.java | 3 +++
.../service/cluster/InlongClusterServiceImpl.java | 17 ++++++++++++++++-
5 files changed, 32 insertions(+), 1 deletion(-)
diff --git
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyNodeInfo.java
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyNodeInfo.java
index 1311a1b573..87d081d79a 100644
---
a/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyNodeInfo.java
+++
b/inlong-common/src/main/java/org/apache/inlong/common/pojo/dataproxy/DataProxyNodeInfo.java
@@ -49,4 +49,10 @@ public class DataProxyNodeInfo {
* Node last report load
*/
private Integer nodeLoad;
+
+ /**
+ * Node max packet length
+ */
+ private Integer maxPacketLength;
+
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterDTO.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterDTO.java
index 7143c87a09..e510af919f 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterDTO.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterDTO.java
@@ -49,6 +49,9 @@ public class DataProxyClusterDTO {
@ApiModelProperty("Load of the DataProxy cluster, default is 20")
private Integer load = 20;
+ @ApiModelProperty("Max packet length of the DataProxy cluster")
+ private Integer maxPacketLength;
+
/**
* Get the dto instance from the request
*/
@@ -57,6 +60,7 @@ public class DataProxyClusterDTO {
.isIntranet(request.getIsIntranet())
.isSwitch(request.getIsSwitch())
.load(request.getLoad())
+ .maxPacketLength(request.getMaxPacketLength())
.build();
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterInfo.java
index 5dd7ce0e4d..a38d139c87 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterInfo.java
@@ -47,6 +47,9 @@ public class DataProxyClusterInfo extends ClusterInfo {
@ApiModelProperty("Load of the DataProxy cluster, default is 20")
private Integer load = 20;
+ @ApiModelProperty("Max packet length of the DataProxy cluster")
+ private Integer maxPacketLength;
+
public DataProxyClusterInfo() {
this.setType(ClusterType.DATAPROXY);
}
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterRequest.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterRequest.java
index fb84b01aeb..84bba41957 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterRequest.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/cluster/dataproxy/DataProxyClusterRequest.java
@@ -46,6 +46,9 @@ public class DataProxyClusterRequest extends ClusterRequest {
@ApiModelProperty("Load of the DataProxy cluster, default is 20")
private Integer load = 20;
+ @ApiModelProperty("Max packet length of the DataProxy cluster")
+ private Integer maxPacketLength;
+
public DataProxyClusterRequest() {
this.setType(ClusterType.DATAPROXY);
}
diff --git
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
index 7882e29c12..99505b1bfe 100644
---
a/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
+++
b/inlong-manager/manager-service/src/main/java/org/apache/inlong/manager/service/cluster/InlongClusterServiceImpl.java
@@ -62,6 +62,7 @@ import
org.apache.inlong.manager.pojo.cluster.TenantClusterTagInfo;
import org.apache.inlong.manager.pojo.cluster.TenantClusterTagPageRequest;
import org.apache.inlong.manager.pojo.cluster.TenantClusterTagRequest;
import org.apache.inlong.manager.pojo.cluster.agent.AgentClusterNodeRequest;
+import org.apache.inlong.manager.pojo.cluster.dataproxy.DataProxyClusterDTO;
import
org.apache.inlong.manager.pojo.cluster.dataproxy.DataProxyClusterNodeDTO;
import org.apache.inlong.manager.pojo.cluster.pulsar.PulsarClusterDTO;
import org.apache.inlong.manager.pojo.common.PageResult;
@@ -952,7 +953,14 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
}
// all cluster nodes belong to the same clusterId
- response.setClusterId(nodeEntities.get(0).getParentId());
+ Integer clusterId = nodeEntities.get(0).getParentId();
+ Integer maxPacketLength = null;
+ response.setClusterId(clusterId);
+ InlongClusterEntity dataProxyCluster =
clusterMapper.selectById(clusterId);
+ if (dataProxyCluster != null &&
StringUtils.isNotBlank(dataProxyCluster.getExtParams())) {
+ DataProxyClusterDTO dataProxyClusterDTO =
DataProxyClusterDTO.getFromJson(dataProxyCluster.getExtParams());
+ maxPacketLength = dataProxyClusterDTO.getMaxPacketLength();
+ }
// TODO consider the data proxy load and re-balance
List<DataProxyNodeInfo> nodeList = new ArrayList<>();
@@ -970,6 +978,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
nodeInfo.setPort(nodeEntity.getPort());
nodeInfo.setProtocolType(nodeEntity.getProtocolType());
nodeInfo.setNodeLoad(nodeEntity.getNodeLoad());
+ nodeInfo.setMaxPacketLength(maxPacketLength);
nodeList.add(nodeInfo);
}
response.setNodeList(nodeList);
@@ -991,6 +1000,11 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
LOGGER.debug("not any dataproxy cluster for clusterName={},
protocol={}", clusterName, protocolType);
return response;
}
+ Integer maxPacketLength = null;
+ if (StringUtils.isNotBlank(clusterEntity.getExtParams())) {
+ DataProxyClusterDTO dataProxyClusterDTO =
DataProxyClusterDTO.getFromJson(clusterEntity.getExtParams());
+ maxPacketLength = dataProxyClusterDTO.getMaxPacketLength();
+ }
List<InlongClusterNodeEntity> nodeEntities =
clusterNodeMapper.selectByParentId(clusterEntity.getId(),
protocolType);
if (CollectionUtils.isEmpty(nodeEntities)) {
@@ -1027,6 +1041,7 @@ public class InlongClusterServiceImpl implements
InlongClusterService {
nodeInfo.setPort(nodeEntity.getPort());
nodeInfo.setProtocolType(nodeEntity.getProtocolType());
nodeInfo.setNodeLoad(nodeEntity.getNodeLoad());
+ nodeInfo.setMaxPacketLength(maxPacketLength);
nodeList.add(nodeInfo);
}
response.setNodeList(nodeList);
