From d29f0651e2d97aa90e6d2428bd6df44d1464b907 Mon Sep 17 00:00:00 2001
From: Echo009 <ech0.extreme@foxmail.com>
Date: Tue, 16 Mar 2021 19:35:49 +0800
Subject: [PATCH] fix: missing node status info in workflow instance DAG

---
 .../server/core/workflow/WorkflowInstanceManager.java      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java
index 4424b7c5..619cf325 100644
--- a/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java
+++ b/powerjob-server/powerjob-server-core/src/main/java/tech/powerjob/server/core/workflow/WorkflowInstanceManager.java
@@ -87,7 +87,7 @@ public class WorkflowInstanceManager {
         // 构造实例信息
         WorkflowInstanceInfoDO newWfInstance = constructWfInstance(wfInfo, initParams, expectTriggerTime, wfId, wfInstanceId);
 
-        PEWorkflowDAG dag;
+        PEWorkflowDAG dag = null;
         try {
             dag = JSON.parseObject(wfInfo.getPeDAG(), PEWorkflowDAG.class);
             // 校验 DAG 信息
@@ -97,7 +97,6 @@ public class WorkflowInstanceManager {
             }
             // 初始化节点信息
             initNodeInfo(dag);
-            newWfInstance.setDag(JSON.toJSONString(dag));
             //  最后检查工作流中的任务是否均处于可用状态（没有被删除）
             Set<Long> allJobIds = Sets.newHashSet();
             dag.getNodes().forEach(node -> {
@@ -112,8 +111,12 @@ public class WorkflowInstanceManager {
                 log.warn("[Workflow-{}|{}] this workflow need {} jobs, but just find {} jobs in database, maybe you delete or disable some job!", wfId, wfInstanceId, needNum, dbNum);
                 throw new PowerJobException(SystemInstanceResult.CAN_NOT_FIND_JOB);
             }
+            newWfInstance.setDag(JSON.toJSONString(dag));
             workflowInstanceInfoRepository.saveAndFlush(newWfInstance);
         } catch (Exception e) {
+            if (dag != null) {
+                newWfInstance.setDag(JSON.toJSONString(dag));
+            }
             onWorkflowInstanceFailed(e.getMessage(), newWfInstance);
         }
         return wfInstanceId;