Optimize the getAppConnNodeUrl in workflow server to bring flowId info in request body.

wushengyeyouya · wushengyeyouya · commit a76b9b04b012 · 2022-06-29T22:50:04.000+08:00
diff --git a/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/util/ApiUtils.java b/dss-apps/dss-apiservice-server/src/main/java/com/webank/wedatasphere/dss/apiservice/core/util/ApiUtils.java
@@ -18,6 +18,7 @@
 
 import com.webank.wedatasphere.dss.apiservice.core.exception.*;
 import com.webank.wedatasphere.dss.apiservice.core.vo.MessageVo;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.linkis.common.exception.WarnException;
 import org.apache.linkis.server.Message;
 import org.slf4j.Logger;
@@ -39,27 +40,15 @@ public static Message doAndResponse(TryOperation tryOperation, String method, St
         try {
             Message message = tryOperation.operateAndGetMessage();
             return setMethod(message, method);
-        } catch (ConstraintViolationException e) {
-            LOG.error("api error, method: " + method, e);
-            return Message.error(e.getMessage());
         } catch (WarnException e) {
             LOG.error("api error, method: " + method, e);
             return setMethod(Message.warn(e.getMessage()), method);
-        } catch (AssertException e) {
+        } catch (AssertException | ApiExecuteException | ApiServiceQueryException e) {
             LOG.error("api error, method: " + method, e);
             return setMethod(Message.error(e.getMessage()), method);
-
-        } catch (ApiExecuteException e) {
-        LOG.error("api error, method: " + method, e);
-        return setMethod(Message.error(e.getMessage()), method);
-        }
-        catch (ApiServiceQueryException e) {
-            LOG.error("api error, method: " + method, e);
-            return setMethod(Message.error(e.getMessage()), method);
-        }
-        catch (Exception e) {
+        } catch (Exception e) {
             LOG.error("api error, method: " + method, e);
-            return Message.error(e.getMessage());
+            return Message.error(ExceptionUtils.getRootCauseMessage(e));
         }
     }
 
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/AppConnNodeUrlRequest.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/entity/request/AppConnNodeUrlRequest.java
@@ -7,6 +7,7 @@
 public class AppConnNodeUrlRequest {
 
     private Long projectID;
+    private Long flowId;
     private String nodeType;
     private Map<String, Object> params;
     private LabelRouteVO labels;
@@ -42,4 +43,13 @@ public LabelRouteVO getLabels() {
     public void setLabels(LabelRouteVO labels) {
         this.labels = labels;
     }
+
+    public Long getFlowId() {
+        return flowId;
+    }
+
+    public void setFlowId(Long flowId) {
+        this.flowId = flowId;
+    }
+
 }
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/NodeRestfulApi.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/restful/NodeRestfulApi.java
@@ -163,7 +163,8 @@ public Message createExternalNode(HttpServletRequest req, @RequestBody CreateExt
         Map<String, Object> params = createExternalNodeRequest.getParams();
         String nodeId = createExternalNodeRequest.getNodeID();
 
-        logger.info("try to create a {} node for workflow {}, params is {}.", nodeType, flowId, params);
+        logger.info("User {} try to create a {} node for workflow {} in projectId {}, params is {}.",
+                userName, nodeType, flowId, projectId, params);
         CommonAppConnNode node = new CommonAppConnNode();
         node.setNodeType(nodeType);
         node.setFlowId(flowId);
@@ -209,13 +210,15 @@ public Message updateExternalNode(HttpServletRequest req, @RequestBody UpdateExt
         String userName = SecurityFilter.getLoginUsername(req);
         Workspace workspace = SSOHelper.getWorkspace(req);
         Long projectId = updateExternalNodeRequest.getProjectID();
+        Long flowId = updateExternalNodeRequest.getFlowID();
         String nodeType = updateExternalNodeRequest.getNodeType();
         Map<String, Object> params = updateExternalNodeRequest.getParams();
-        logger.info("UpdateExternalNode request params is " + params + ", nodeType:" + nodeType);
+        logger.info("User {} try to update ExternalNode request with projectId {}, flowId {}, params is {}, nodeType: {}.",
+                userName, projectId, flowId, params, nodeType);
         CommonAppConnNode node = new CommonAppConnNode();
         node.setProjectId(projectId);
         node.setNodeType(nodeType);
-        node.setFlowId(updateExternalNodeRequest.getFlowID());
+        node.setFlowId(flowId);
         String label = updateExternalNodeRequest.getLabels().getRoute();
         node.setDssLabels(Collections.singletonList(new EnvDSSLabel(label)));
         node.setWorkspace(workspace);
@@ -230,16 +233,19 @@ public Message deleteExternalNode(HttpServletRequest req, @RequestBody UpdateExt
         String userName = SecurityFilter.getLoginUsername(req);
         Workspace workspace = SSOHelper.getWorkspace(req);
         Long projectId = updateExternalNodeRequest.getProjectID();
+        Long flowId = updateExternalNodeRequest.getFlowID();
         String nodeType = updateExternalNodeRequest.getNodeType();
         Map<String, Object> params = updateExternalNodeRequest.getParams();
+        logger.info("User {} with the workflow {} in project {} try to delete externalNode with params: {}, nodeType: {}.",
+                userName, flowId, projectId, params, nodeType);
         CommonAppConnNode node = new CommonAppConnNode();
         String label = updateExternalNodeRequest.getLabels().getRoute();
         node.setDssLabels(Collections.singletonList(new EnvDSSLabel(label)));
         node.setWorkspace(workspace);
         node.setProjectId(projectId);
         node.setNodeType(nodeType);
         node.setJobContent(params);
-        node.setFlowId(updateExternalNodeRequest.getFlowID());
+        node.setFlowId(flowId);
         node.setName(updateExternalNodeRequest.getName());
         workflowNodeService.deleteNode(userName, node);
         return Message.ok().data("result", node.getJobContent());
@@ -255,7 +261,8 @@ public Message batchDeleteAppConnNode(HttpServletRequest req, @RequestBody Batch
             String nodeType = json.get("nodeType").toString();
             Long flowId = (Long) json.get("flowID");
             Map<String, Object> params = (Map<String, Object>) json.get("params");
-            logger.info("DeletepExternalNode request params is " + params + ", nodeType:" + nodeType);
+            logger.info("User {} try to delete ExternalNode with projectId {}, flowId {}, params is {}, nodeType: {}.",
+                    userName, projectId, flowId, params, nodeType);
             CommonAppConnNode node = new CommonAppConnNode();
             String label = ((Map<String, Object>) json.get("labels")).get("route").toString();
             node.setDssLabels(Collections.singletonList(new EnvDSSLabel(label)));
@@ -275,14 +282,17 @@ public Message getAppConnNodeUrl(HttpServletRequest req, @RequestBody AppConnNod
         String userName = SecurityFilter.getLoginUsername(req);
         Workspace workspace = SSOHelper.getWorkspace(req);
         Long projectId = appConnNodeUrlRequest.getProjectID();
+        Long flowId = appConnNodeUrlRequest.getFlowId();
         String nodeType = appConnNodeUrlRequest.getNodeType();
         Map<String, Object> params = appConnNodeUrlRequest.getParams();
-        logger.info("getAppConnNodeUrl request params is " + params + ", nodeType:" + nodeType);
+        logger.info("User {} with the workflow {} in project {} try to getAppConnNodeUrl with params: {}, nodeType: {}.",
+                userName, flowId, projectId, params, nodeType);
         CommonAppConnNode node = new CommonAppConnNode();
         node.setWorkspace(workspace);
         node.setProjectId(projectId);
         node.setNodeType(nodeType);
         node.setJobContent(params);
+        node.setFlowId(flowId);
         String label = appConnNodeUrlRequest.getLabels().getRoute();
         node.setDssLabels(Collections.singletonList(new EnvDSSLabel(label)));
         String jumpUrl = workflowNodeService.getNodeJumpUrl(params, node, userName);
diff --git a/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/WorkflowNodeServiceImpl.java b/dss-orchestrator/orchestrators/dss-workflow/dss-workflow-server/src/main/java/com/webank/wedatasphere/dss/workflow/service/impl/WorkflowNodeServiceImpl.java
@@ -141,7 +141,7 @@ private <K extends DevelopmentRequestRef, V extends ResponseRef> V tryNodeOperat
                     dssJobContentRequestRef.setDSSJobContent(new HashMap<>());
                     String orcVersion;
                     try {
-                        orcVersion = getOrcVersion(node.getFlowId());
+                        orcVersion = getOrcVersion(node);
                     } catch (Exception e) {
                         throw new ExternalOperationFailedException(50205, "get workflow version failed.", e);
                     }
@@ -203,7 +203,7 @@ public Map<String, Object> refresh(String userName, CommonAppConnNode node) {
     public Map<String, Object> copyNode(String userName, CommonAppConnNode newNode,
                                         CommonAppConnNode oldNode, String orcVersion) throws IOException, DSSErrorException {
         if (StringUtils.isBlank(orcVersion)) {
-            orcVersion = getOrcVersion(oldNode.getFlowId());
+            orcVersion = getOrcVersion(oldNode);
         }
         String finalOrcVersion = orcVersion;
         RefJobContentResponseRef responseRef = tryNodeOperation(userName, oldNode,
@@ -272,11 +272,14 @@ public String getNodeJumpUrl(Map<String, Object> params, CommonAppConnNode node,
         }
     }
 
-    private String getOrcVersion(Long flowId) throws IOException {
-        if (flowId == null) {
-            return null;
+    private String getOrcVersion(CommonAppConnNode node) throws IOException {
+        if (node.getFlowId() == null) {
+            throw new NullPointerException("The flowId is null, please ask admin for help!");
+        }
+        DSSFlow dssFlow = dssFlowService.getFlow(node.getFlowId());
+        if(StringUtils.isBlank(node.getFlowName())) {
+            node.setFlowName(dssFlow.getName());
         }
-        DSSFlow dssFlow = dssFlowService.getFlow(flowId);
         return workFlowParser.getValueWithKey(dssFlow.getFlowJson(), DSSJobContentConstant.ORC_VERSION_KEY);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ private <K extends DevelopmentRequestRef, V extends ResponseRef> V tryNodeOperat`
`141`	`141`	`dssJobContentRequestRef.setDSSJobContent(new HashMap<>());`
`142`	`142`	`String orcVersion;`
`143`	`143`	`try {`
`144`		`- orcVersion = getOrcVersion(node.getFlowId());`
	`144`	`+ orcVersion = getOrcVersion(node);`
`145`	`145`	`} catch (Exception e) {`
`146`	`146`	`throw new ExternalOperationFailedException(50205, "get workflow version failed.", e);`
`147`	`147`	`}`
`@@ -203,7 +203,7 @@ public Map<String, Object> refresh(String userName, CommonAppConnNode node) {`
`203`	`203`	`public Map<String, Object> copyNode(String userName, CommonAppConnNode newNode,`
`204`	`204`	`CommonAppConnNode oldNode, String orcVersion) throws IOException, DSSErrorException {`
`205`	`205`	`if (StringUtils.isBlank(orcVersion)) {`
`206`		`- orcVersion = getOrcVersion(oldNode.getFlowId());`
	`206`	`+ orcVersion = getOrcVersion(oldNode);`
`207`	`207`	`}`
`208`	`208`	`String finalOrcVersion = orcVersion;`
`209`	`209`	`RefJobContentResponseRef responseRef = tryNodeOperation(userName, oldNode,`
`@@ -272,11 +272,14 @@ public String getNodeJumpUrl(Map<String, Object> params, CommonAppConnNode node,`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`		`- private String getOrcVersion(Long flowId) throws IOException {`
`276`		`- if (flowId == null) {`
`277`		`- return null;`
	`275`	`+ private String getOrcVersion(CommonAppConnNode node) throws IOException {`
	`276`	`+ if (node.getFlowId() == null) {`
	`277`	`+ throw new NullPointerException("The flowId is null, please ask admin for help!");`
	`278`	`+ }`
	`279`	`+ DSSFlow dssFlow = dssFlowService.getFlow(node.getFlowId());`
	`280`	`+ if(StringUtils.isBlank(node.getFlowName())) {`
	`281`	`+ node.setFlowName(dssFlow.getName());`
`278`	`282`	`}`
`279`		`- DSSFlow dssFlow = dssFlowService.getFlow(flowId);`
`280`	`283`	`return workFlowParser.getValueWithKey(dssFlow.getFlowJson(), DSSJobContentConstant.ORC_VERSION_KEY);`
`281`	`284`	`}`
`282`	`285`