[chore](backup) log backup/restore job during replay (#35234)

apache · May 23, 2024 · 176e719 · 176e719
1 parent 4fc61a9
commit 176e719
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 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
@@ -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
@@ -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) {