You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@linkis.apache.org by ca...@apache.org on 2022/10/16 05:58:43 UTC
[incubator-linkis] branch dev-1.3.1-errorcode updated: [linkis-manager-persistence]errorcode code optimization (#3532)
This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1-errorcode
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1-errorcode by this push:
new 16e5ab840 [linkis-manager-persistence]errorcode code optimization (#3532)
16e5ab840 is described below
commit 16e5ab840d992be2c863e68e833f42c55daba088
Author: 成彬彬 <10...@users.noreply.github.com>
AuthorDate: Sun Oct 16 13:58:37 2022 +0800
[linkis-manager-persistence]errorcode code optimization (#3532)
---
.../linkis-manager-persistence-errorcode.md | 9 +++
.../LinkisManagerPersistenceErrorCodeSummary.java | 72 ++++++++++++++++++++++
.../impl/DefaultLabelManagerPersistence.java | 8 ++-
.../impl/DefaultNodeManagerPersistence.java | 33 ++++++----
4 files changed, 109 insertions(+), 13 deletions(-)
diff --git a/docs/errorcode/linkis-manager-persistence-errorcode.md b/docs/errorcode/linkis-manager-persistence-errorcode.md
new file mode 100644
index 000000000..d35763fc8
--- /dev/null
+++ b/docs/errorcode/linkis-manager-persistence-errorcode.md
@@ -0,0 +1,9 @@
+## linkis-manager-persistence errorcode
+
+| module name(模块名) | error code(错误码) | describe(描述) |enumeration name(枚举)| Exception Class(类名)|
+| -------- | -------- | ----- |-----|-----|
+|linkis-manager-persistence|10000|beanutils populate failed (beanutils 填充失败)|BEANUTILS_POPULATE_FAILED|LinkisManagerPersistenceErrorCodeSummary|
+|linkis-manager-persistence|41001|Node instance already exists(Node实例已存在)|NODE_INSTANCE_ALREADY_EXISTS|LinkisManagerPersistenceErrorCodeSummary|
+|linkis-manager-persistence|41002|Node instance does not exist(Node实例不存在)|BEANUTILS_POPULATE_FAILED|LinkisManagerPersistenceErrorCodeSummary|
+|linkis-manager-persistence|410002|The emNode is null (emNode 为空)|THE_EMNODE_IS_NULL|LinkisManagerPersistenceErrorCodeSummary|
+
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/errorcode/LinkisManagerPersistenceErrorCodeSummary.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/errorcode/LinkisManagerPersistenceErrorCodeSummary.java
new file mode 100644
index 000000000..f4d505ff3
--- /dev/null
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/errorcode/LinkisManagerPersistenceErrorCodeSummary.java
@@ -0,0 +1,72 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.manager.errorcode;
+
+public enum LinkisManagerPersistenceErrorCodeSummary {
+ BEANUTILS_POPULATE_FAILED(
+ 10000,
+ "beanutils populate failed (beanutils 填充失败)",
+ "beanutils populate failed (beanutils 填充失败)"),
+ NODE_INSTANCE_ALREADY_EXISTS(
+ 41001, "Node instance already exists(Node实例已存在)", "Node instance already exists(Node实例已存在)"),
+ NODE_INSTANCE_DOES_NOT_EXIST(
+ 41002, "Node instance does not exist(Node实例不存在)", "Node instance does not exist(Node实例不存在)"),
+ THE_EMNODE_IS_NULL(410002, "The emNode is null (emNode 为空)", "The emNode is null (emNode 为空)");
+
+ /** (errorCode)错误码 */
+ private int errorCode;
+ /** (errorDesc)错误描述 */
+ private String errorDesc;
+ /** Possible reasons for the error(错误可能出现的原因) */
+ private String comment;
+
+ LinkisManagerPersistenceErrorCodeSummary(int errorCode, String errorDesc, String comment) {
+ this.errorCode = errorCode;
+ this.errorDesc = errorDesc;
+ this.comment = comment;
+ }
+
+ public int getErrorCode() {
+ return errorCode;
+ }
+
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
+ }
+
+ public String getErrorDesc() {
+ return errorDesc;
+ }
+
+ public void setErrorDesc(String errorDesc) {
+ this.errorDesc = errorDesc;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ @Override
+ public String toString() {
+ return "errorCode: " + this.errorCode + ", errorDesc:" + this.errorDesc;
+ }
+}
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
index 2a8c78fa0..a672fa35f 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultLabelManagerPersistence.java
@@ -41,6 +41,8 @@ import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.linkis.manager.errorcode.LinkisManagerPersistenceErrorCodeSummary.BEANUTILS_POPULATE_FAILED;
+
public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -310,7 +312,8 @@ public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
Map.Entry::getKey,
f -> f.getValue().stream().map(Tunple::getValue).collect(Collectors.toList())));
} catch (InvocationTargetException | IllegalAccessException e) {
- throw new PersistenceWarnException(10000, "beanutils populate failed", e);
+ throw new PersistenceWarnException(
+ BEANUTILS_POPULATE_FAILED.getErrorCode(), BEANUTILS_POPULATE_FAILED.getErrorDesc(), e);
}
}
@@ -347,7 +350,8 @@ public class DefaultLabelManagerPersistence implements LabelManagerPersistence {
Map.Entry::getKey,
f -> f.getValue().stream().map(Tunple::getValue).collect(Collectors.toList())));
} catch (InvocationTargetException | IllegalAccessException e) {
- throw new PersistenceWarnException(10000, "beanutils populate failed", e);
+ throw new PersistenceWarnException(
+ BEANUTILS_POPULATE_FAILED.getErrorCode(), BEANUTILS_POPULATE_FAILED.getErrorDesc(), e);
}
}
diff --git a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java
index 99615c6e5..ad7a743e8 100644
--- a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java
+++ b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/persistence/impl/DefaultNodeManagerPersistence.java
@@ -38,6 +38,8 @@ import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import static org.apache.linkis.manager.errorcode.LinkisManagerPersistenceErrorCodeSummary.*;
+
public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
private NodeManagerMapper nodeManagerMapper;
@@ -76,7 +78,9 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
nodeManagerMapper.addNodeInstance(persistenceNode);
} catch (DuplicateKeyException e) {
NodeInstanceDuplicateException nodeInstanceDuplicateException =
- new NodeInstanceDuplicateException(41001, "Node实例已存在");
+ new NodeInstanceDuplicateException(
+ NODE_INSTANCE_ALREADY_EXISTS.getErrorCode(),
+ NODE_INSTANCE_ALREADY_EXISTS.getErrorDesc());
nodeInstanceDuplicateException.initCause(e);
throw nodeInstanceDuplicateException;
}
@@ -91,7 +95,9 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
persistenceNode.setOwner(node.getOwner());
persistenceNode.setMark(node.getMark());
persistenceNode.setUpdateTime(new Date());
- persistenceNode.setCreator(node.getOwner()); // rm中插入记录的时候并未给出creator，所以需要set这个值
+ persistenceNode.setCreator(
+ node.getOwner()); // The creator is not given when inserting records in rm, so you need to
+ // set this value(rm中插入记录的时候并未给出creator，所以需要set这个值)
persistenceNode.setUpdator(node.getOwner());
try {
nodeManagerMapper.updateNodeInstance(serviceInstance.getInstance(), persistenceNode);
@@ -104,7 +110,9 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
41003, "engine instance name is exist, request of created engine will be retry");
} catch (Exception e) {
NodeInstanceNotFoundException nodeInstanceNotFoundException =
- new NodeInstanceNotFoundException(41002, "Node实例不存在");
+ new NodeInstanceNotFoundException(
+ NODE_INSTANCE_DOES_NOT_EXIST.getErrorCode(),
+ NODE_INSTANCE_DOES_NOT_EXIST.getErrorDesc());
nodeInstanceNotFoundException.initCause(e);
throw nodeInstanceNotFoundException;
}
@@ -117,7 +125,9 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
nodeManagerMapper.removeNodeInstance(instance);
} catch (Exception e) {
NodeInstanceNotFoundException nodeInstanceNotFoundException =
- new NodeInstanceNotFoundException(41002, "Node实例不存在");
+ new NodeInstanceNotFoundException(
+ NODE_INSTANCE_DOES_NOT_EXIST.getErrorCode(),
+ NODE_INSTANCE_DOES_NOT_EXIST.getErrorDesc());
nodeInstanceNotFoundException.initCause(e);
throw nodeInstanceNotFoundException;
}
@@ -198,13 +208,14 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
@Override
public void addEngineNode(EngineNode engineNode) throws PersistenceErrorException {
- // 插入engine
+ // insert engine(插入engine)
addNodeInstance(engineNode);
- // 插入关联关系，todo 异常后续统一处理
+ // insert relationship,(插入关联关系，)todo 异常后续统一处理
String engineNodeInstance = engineNode.getServiceInstance().getInstance();
if (null == engineNode.getEMNode()) {
throw new PersistenceErrorException(
- 410002, " The emNode is null " + engineNode.getServiceInstance());
+ THE_EMNODE_IS_NULL.getErrorCode(),
+ THE_EMNODE_IS_NULL.getErrorDesc() + engineNode.getServiceInstance());
}
String emNodeInstance = engineNode.getEMNode().getServiceInstance().getInstance();
nodeManagerMapper.addEngineNode(engineNodeInstance, emNodeInstance);
@@ -215,20 +226,20 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
String engineNodeInstance = engineNode.getServiceInstance().getInstance();
if (null != engineNode.getEMNode()) {
String emNodeInstance = engineNode.getEMNode().getServiceInstance().getInstance();
- // 清理 engine和em 的关系表
+ // Clean up the relation table between engine and em(清理 engine和em 的关系表)
nodeManagerMapper.deleteEngineNode(engineNodeInstance, emNodeInstance);
}
// 清理 metric信息
metricManagerMapper.deleteNodeMetricsByInstance(engineNodeInstance);
// metricManagerMapper.deleteNodeMetrics(emNodeId);
- // 清除 引擎
+ // 清除 引擎(clear engine)
nodeManagerMapper.removeNodeInstance(engineNode.getServiceInstance().getInstance());
}
@Override
public EngineNode getEngineNode(ServiceInstance serviceInstance)
throws PersistenceErrorException {
- // 给定引擎的 serviceinstance 查到 emNode
+ // The serviceinstance of a given engine finds emNode (给定引擎的 serviceinstance 查到 emNode)
AMEngineNode amEngineNode = new AMEngineNode();
amEngineNode.setServiceInstance(serviceInstance);
PersistenceNode engineNode = nodeManagerMapper.getNodeInstance(serviceInstance.getInstance());
@@ -259,7 +270,7 @@ public class DefaultNodeManagerPersistence implements NodeManagerPersistence {
@Override
public List<EngineNode> getEngineNodeByEM(ServiceInstance serviceInstance)
throws PersistenceErrorException {
- // 给定EM的 serviceinstance
+ // serviceinstance for a given EM(给定EM的 serviceinstance)
PersistenceNode emNode = nodeManagerMapper.getNodeInstance(serviceInstance.getInstance());
if (null == emNode) {
return new ArrayList<>();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@linkis.apache.org
For additional commands, e-mail: commits-help@linkis.apache.org