From b88ac255f8a8fb6e897e9f62491dd66ff3712a04 Mon Sep 17 00:00:00 2001
From: w41ter <w41ter.l@gmail.com>
Date: Wed, 22 May 2024 13:23:21 +0000
Subject: [PATCH] [chore](backup) log backup/restore job during replay

---
 .../java/org/apache/doris/backup/BackupHandler.java    |  2 ++
 .../org/apache/doris/regression/suite/Syncer.groovy    | 10 ++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java
index fc2b0259f02b9d..c3e59e269f6cc7 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java
@@ -748,6 +748,8 @@ public boolean handleDirMoveTask(DirMoveTask task, TFinishTaskRequest request) {
     }
 
     public void replayAddJob(AbstractJob job) {
+        LOG.info("replay backup/restore job: {}", job);
+
         if (job.isCancelled()) {
             AbstractJob existingJob = getCurrentJob(job.getDbId());
             if (existingJob == null || existingJob.isDone()) {
diff --git a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
index 874a0e5c0be52e..64ebeb03a0ace9 100644
--- a/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
+++ b/regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
@@ -355,14 +355,15 @@ class Syncer {
         }
         String checkSQL = "SHOW BACKUP FROM ${dbName}"
         def records = suite.sql(checkSQL)
+        def allDone = true
         for (row in records) {
             logger.info("BACKUP row is ${row}")
             String state = (row[3] as String);
             if (state != "FINISHED" && state != "CANCELLED") {
-                return false
+                allDone = false
             }
         }
-        true
+        allDone
     }
 
     void waitSnapshotFinish(String dbName = null) {
@@ -404,14 +405,15 @@ class Syncer {
         }
         String checkSQL = "SHOW RESTORE FROM ${dbName}"
         def records = suite.sql(checkSQL)
+        def allDone = true
         for (row in records) {
             logger.info("Restore row is ${row}")
             String state = row[4]
             if (state != "FINISHED" && state != "CANCELLED") {
-                return false
+                allDone = false
             }
         }
-        true
+        allDone
     }
 
     void waitAllRestoreFinish(String dbName = null) {