feat: 执行历史归档新增模式-只备份不删除 TencentBlueKing#3037

wangyu096 · Jun 6, 2024 · c5b0bc6 · c5b0bc6
1 parent 128db0d
commit c5b0bc6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/...service-job-backup/src/main/java/com/tencent/bk/job/backup/archive/AbstractArchivist.java b/...service-job-backup/src/main/java/com/tencent/bk/job/backup/archive/AbstractArchivist.java
@@ -183,6 +183,7 @@ public void archive() {
                 // min 查询返回 null，说明是空表，无需归档
                 archiveSummary.setSkip(true);
                 archiveSummary.setSuccess(true);
+                archiveSummary.setMessage("Empty table, do not need archive");
                 log.info("[{}] Empty table, do not need archive!", tableName);
                 return;
             }
@@ -192,6 +193,7 @@ public void archive() {
                     tableName, minNeedArchiveId, maxNeedArchiveId);
                 archiveSummary.setSkip(true);
                 archiveSummary.setSuccess(true);
+                archiveSummary.setMessage("MinNeedArchiveId is greater than maxNeedArchiveId, skip archive table");
                 return;
             }
 
@@ -205,6 +207,7 @@ public void archive() {
             ).getMessage();
             log.error(msg, e);
             archiveErrorTaskCounter.increment();
+            archiveSummary.setMessage(e.getMessage());
         } finally {
             archiveSummary.setArchiveMode(archiveDBProperties.getMode());
             storeArchiveSummary();
@@ -228,10 +231,15 @@ private void backupAndDelete() throws IOException {
         long backupReadRecordCost = 0;
         long backupWriteRecordCost = 0;
         long deleteCost = 0;
+        log.info("[{}] Start backup and delete process, backupEnabled: {}, deleteEnabled: {}", tableName,
+            backupEnabled, deleteEnabled);
         try {
             while (maxNeedArchiveId > start) {
                 // start < id <= stop
                 stop = Math.min(maxNeedArchiveId, start + readIdStepSize);
+
+                log.info("[{}] LoopArchive, current: [{}-{}]", tableName, start, stop);
+
                 BackupResult backupResult = null;
                 if (backupEnabled) {
                     backupResult = backupRecords(start, stop);

diff --git a/.../service-job-backup/src/main/java/com/tencent/bk/job/backup/model/dto/ArchiveSummary.java b/.../service-job-backup/src/main/java/com/tencent/bk/job/backup/model/dto/ArchiveSummary.java
@@ -67,6 +67,11 @@ public class ArchiveSummary {
     private Long lastDeletedId;
     private Long deleteRecordSize;
 
+    /**
+     * 归档详细说明信息
+     */
+    private String message;
+
     public ArchiveSummary(String tableName) {
         this.tableName = tableName;
     }