From 08f8a1141e500bf68820edaa6a731499a3bd589a Mon Sep 17 00:00:00 2001
From: tjq <tengjiqi@gmail.com>
Date: Thu, 26 Nov 2020 00:14:05 +0800
Subject: [PATCH] fix: delete non-finished instance #109

---
 .../kfcfans/powerjob/common/WorkflowInstanceStatus.java     | 3 ++-
 .../persistence/core/repository/InstanceInfoRepository.java | 4 ++--
 .../core/repository/WorkflowInstanceInfoRepository.java     | 4 ++--
 .../powerjob/server/service/timing/CleanService.java        | 6 ++++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java
index 4a2a1e6f..7bba8d25 100644
--- a/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java
+++ b/powerjob-common/src/main/java/com/github/kfcfans/powerjob/common/WorkflowInstanceStatus.java
@@ -24,7 +24,8 @@ public enum WorkflowInstanceStatus {
 
     // 广义的运行状态
     public static final List<Integer> generalizedRunningStatus = Lists.newArrayList(WAITING.v, RUNNING.v);
-
+    // 结束状态
+    public static final List<Integer> finishedStatus = Lists.newArrayList(FAILED.v, SUCCEED.v, STOPPED.v);
 
     private int v;
     private String des;
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java
index f65fb299..3742e3c8 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/InstanceInfoRepository.java
@@ -71,6 +71,6 @@ public interface InstanceInfoRepository extends JpaRepository<InstanceInfoDO, Lo
     // 结果只能用 int 接收
     @Modifying
     @Transactional
-    @Query(value = "delete from InstanceInfoDO where gmtModified < ?1")
-    int deleteAllByGmtModifiedBefore(Date time);
+    @Query(value = "delete from InstanceInfoDO where gmtModified < ?1 and status in ?2")
+    int deleteAllByGmtModifiedBeforeAndStatusIn(Date time, List<Integer> status);
 }
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java
index 35d97455..6dabc143 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/core/repository/WorkflowInstanceInfoRepository.java
@@ -24,8 +24,8 @@ public interface WorkflowInstanceInfoRepository extends JpaRepository<WorkflowIn
     // 结果只能用 int 接收
     @Modifying
     @Transactional
-    @Query(value = "delete from WorkflowInstanceInfoDO where gmtModified < ?1")
-    int deleteAllByGmtModifiedBefore(Date time);
+    @Query(value = "delete from WorkflowInstanceInfoDO where gmtModified < ?1 and status in ?2")
+    int deleteAllByGmtModifiedBeforeAndStatusIn(Date time, List<Integer> status);
 
     int countByWorkflowIdAndStatusIn(Long workflowId, List<Integer> status);
 
diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
index da429f08..f180ce3d 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/service/timing/CleanService.java
@@ -1,5 +1,7 @@
 package com.github.kfcfans.powerjob.server.service.timing;
 
+import com.github.kfcfans.powerjob.common.InstanceStatus;
+import com.github.kfcfans.powerjob.common.WorkflowInstanceStatus;
 import com.github.kfcfans.powerjob.server.common.utils.OmsFileUtils;
 import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceInfoRepository;
 import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository;
@@ -128,7 +130,7 @@ public class CleanService {
         }
         try {
             Date t = DateUtils.addDays(new Date(), -instanceInfoRetentionDay);
-            int num = instanceInfoRepository.deleteAllByGmtModifiedBefore(t);
+            int num = instanceInfoRepository.deleteAllByGmtModifiedBeforeAndStatusIn(t, InstanceStatus.finishedStatus);
             log.info("[CleanService] deleted {} instanceInfo records whose modify time before {}.", num, t);
         }catch (Exception e) {
             log.warn("[CleanService] clean instanceInfo failed.", e);
@@ -142,7 +144,7 @@ public class CleanService {
         }
         try {
             Date t = DateUtils.addDays(new Date(), -instanceInfoRetentionDay);
-            int num = workflowInstanceInfoRepository.deleteAllByGmtModifiedBefore(t);
+            int num = workflowInstanceInfoRepository.deleteAllByGmtModifiedBeforeAndStatusIn(t, WorkflowInstanceStatus.finishedStatus);
             log.info("[CleanService] deleted {} workflow instanceInfo records whose modify time before {}.", num, t);
         }catch (Exception e) {
             log.warn("[CleanService] clean workflow instanceInfo failed.", e);