增加ck存储配额删除任务记录日志

3 files changed, 8 insertions, 6 deletions

diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/GalaxyExecutorApplication.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/GalaxyExecutorApplication.java
index 975bc94..d1e393a 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/GalaxyExecutorApplication.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/GalaxyExecutorApplication.java
@@ -7,7 +7,6 @@ import java.util.TimeZone;
 
 
 @SpringBootApplication
-//@SpringBootApplication(exclude= {DataSourceAutoConfiguration.class})
 public class GalaxyExecutorApplication {
 
 	public static void main(String[] args) {
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataExtractJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataExtractJob.java
index 23b224b..7538e5c 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataExtractJob.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/DataExtractJob.java
@@ -141,12 +141,14 @@ public class DataExtractJob {
                     List<Map> transformResult = dataTransformService.isFqdnAccessible(sourceResult, transformParams);
                     logger.info("sharding {} ,paging {} transform execute end", shardingIndex, pageNum);
                     XxlJobLogger.log("sharding {} ,paging {} transform execute end", shardingIndex, pageNum);
+                    sourceResult = null;
                     //数据入库
                     logger.info("sharding {} ,paging {} sink execute start", shardingIndex, pageNum);
                     XxlJobLogger.log("sharding {} ,paging {} sink execute start", shardingIndex, pageNum);
                     dataSinkService.exec(transformResult, sinkParams);
                     logger.info("sharding {} ,paging {} sink execute end", shardingIndex, pageNum);
                     XxlJobLogger.log("sharding {} ,paging {} sink execute end", shardingIndex, pageNum);
+                    transformResult = null;
                 }
                 logger.info("sharding {} task end, take time {}ms", shardingIndex, System.currentTimeMillis() - start);
                 XxlJobLogger.log("sharding {} task end, take time {}ms", shardingIndex, System.currentTimeMillis() - start);
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
index 1a5aa16..33b94fb 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/LogStorageQuotaJob.java
@@ -143,15 +143,16 @@ public class LogStorageQuotaJob {
 
                 try {
                     List<String> partitionList = getSystemDataForCK(ckUrl, Joiner.on("").join("SELECT DISTINCT(`partition`) from " + deletionConfig.getSystemParts() + " WHERE table = '", table, "' AND `partition` < '", deleteMaxDate, "' FORMAT JSON;"));
-
+                    logger.info("reset storage days table {}, drop partition size {} ", table, partitionList.size());
+                    XxlJobLogger.log("reset storage days table {}, drop partition size {} ", table, partitionList.size());
                     partitionList.forEach(partition -> {
                         String deleteSql = Joiner.on("").join(prefixDeleteSql, table, suffixDeleteSql, "'",partition,"'");
                         deleteParamMap.put("query", deleteSql);
-                        XxlJobLogger.log("reset storage days clickhouse sql:{}", deleteSql);
+                        logger.info("reset storage days clickhouse sql:{}", deleteSql);
 
-                        String deleteMessage = HttpClientUtils.httpPost(HttpClientUtils.getUrlWithParams(ckUrl, deleteParamMap), null);
-                        XxlJobLogger.log("reset storage days table {} success, message:{}", table, deleteMessage);
-                        logger.info("reset storage days table {} success, message:{}", table, deleteMessage);
+                        HttpClientUtils.httpPost(HttpClientUtils.getUrlWithParams(ckUrl, deleteParamMap), null);
+                        logger.info("reset storage days table {} partition {} success", table, partition);
+                        XxlJobLogger.log("reset storage days table {} partition {}", table, partition);
                     });
                 } catch (BusinessException e) {
                     failCount++;