From c5b0bc6857efd00972bec75ffee865e5fd53bd63 Mon Sep 17 00:00:00 2001
From: wangyu096 <wangyu096@163.com>
Date: Thu, 6 Jun 2024 09:52:10 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=A7=E8=A1=8C=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3=E6=96=B0=E5=A2=9E=E6=A8=A1=E5=BC=8F-?=
 =?UTF-8?q?=E5=8F=AA=E5=A4=87=E4=BB=BD=E4=B8=8D=E5=88=A0=E9=99=A4=20#3037?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tencent/bk/job/backup/archive/AbstractArchivist.java  | 8 ++++++++
 .../tencent/bk/job/backup/model/dto/ArchiveSummary.java   | 5 +++++
 2 files changed, 13 insertions(+)

diff --git a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/archive/AbstractArchivist.java b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/archive/AbstractArchivist.java
index 4874b13682..8c7afac0a3 100644
--- a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/archive/AbstractArchivist.java
+++ b/src/backend/job-backup/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/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/model/dto/ArchiveSummary.java b/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/model/dto/ArchiveSummary.java
index 04261e4e5e..072b7fec94 100644
--- a/src/backend/job-backup/service-job-backup/src/main/java/com/tencent/bk/job/backup/model/dto/ArchiveSummary.java
+++ b/src/backend/job-backup/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;
     }