From ead9f08e5285ff3ee8bc9b5c0a181662637ad0f5 Mon Sep 17 00:00:00 2001
From: ocean23 <43363687@qq.com>
Date: Sat, 2 Jan 2021 12:38:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9AGridFsManager=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8A=8A=E9=94=81=E5=8A=A0=E5=9C=A8CleanServ?=
 =?UTF-8?q?ice=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../persistence/mongodb/GridFsManager.java     | 18 +-----------------
 .../server/service/timing/CleanService.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java
index da4f8449..71d7d8b8 100644
--- a/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java
+++ b/powerjob-server/src/main/java/com/github/kfcfans/powerjob/server/persistence/mongodb/GridFsManager.java
@@ -1,7 +1,6 @@
 package com.github.kfcfans.powerjob.server.persistence.mongodb;
 
 import com.github.kfcfans.powerjob.server.common.PowerJobServerConfigKey;
-import com.github.kfcfans.powerjob.server.service.lock.LockService;
 import com.google.common.base.Stopwatch;
 import com.google.common.collect.Maps;
 import com.mongodb.client.MongoDatabase;
@@ -39,8 +38,6 @@ public class GridFsManager implements InitializingBean {
 
     @Resource
     private Environment environment;
-    @Resource
-    private LockService lockService;
 
     private MongoDatabase db;
     private boolean available;
@@ -110,22 +107,9 @@ public class GridFsManager implements InitializingBean {
      * @param day 日期偏移量，单位 天
      */
     public void deleteBefore(String bucketName, int day) {
-        String deleteFsLock = "deleteFsLock";
-        // 只要第一个server抢到锁其他server就会返回，所以锁10分钟应该足够了
-        boolean lock = lockService.lock(deleteFsLock, 10 * 60 * 1000);
-        if (!lock) {
-            log.info("[GridFsManager] deleted task is running, it's ok to return.");
-            return;
-        }
-        try{
-            deleteHistoryFile(bucketName, day);
-        }finally {
-            lockService.unlock(deleteFsLock);
-        }
-    }
 
-    private void deleteHistoryFile(String bucketName, int day) {
         Stopwatch sw = Stopwatch.createStarted();
+
         Date date = DateUtils.addDays(new Date(), -day);
         GridFSBucket bucket = getBucket(bucketName);
         Bson filter = Filters.lt("uploadDate", date);
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 f180ce3d..837917fe 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
@@ -7,6 +7,7 @@ import com.github.kfcfans.powerjob.server.persistence.core.repository.InstanceIn
 import com.github.kfcfans.powerjob.server.persistence.core.repository.WorkflowInstanceInfoRepository;
 import com.github.kfcfans.powerjob.server.persistence.mongodb.GridFsManager;
 import com.github.kfcfans.powerjob.server.service.ha.WorkerManagerService;
+import com.github.kfcfans.powerjob.server.service.lock.LockService;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Stopwatch;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +37,8 @@ public class CleanService {
     private InstanceInfoRepository instanceInfoRepository;
     @Resource
     private WorkflowInstanceInfoRepository workflowInstanceInfoRepository;
+    @Resource
+    private LockService lockService;
 
     @Value("${oms.instanceinfo.retention}")
     private int instanceInfoRetentionDay;
@@ -113,11 +116,20 @@ public class CleanService {
             return;
         }
         if (gridFsManager.available()) {
+            String deleteFsLock = "deleteFsLock";
+            // 只要第一个server抢到锁其他server就会返回，所以锁10分钟应该足够了
+            boolean lock = lockService.lock(deleteFsLock, 10 * 60 * 1000);
+            if (!lock) {
+                log.info("[GridFsManager] deleted task is running, it's ok to return.");
+                return;
+            }
             Stopwatch stopwatch = Stopwatch.createStarted();
             try {
                 gridFsManager.deleteBefore(bucketName, day);
             }catch (Exception e) {
                 log.warn("[CleanService] clean remote bucket({}) failed.", bucketName, e);
+            }finally {
+                lockService.unlock(deleteFsLock);
             }
             log.info("[CleanService] clean remote bucket({}) successfully, using {}.", bucketName, stopwatch.stop());
         }