This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 473e14ca823c2ed494cf7789be7180dd36ed3e9c Author: walter <[email protected]> AuthorDate: Thu May 23 10:04:08 2024 +0800 [chore](backup) log backup/restore job during replay (#35234) --- .../src/main/java/org/apache/doris/backup/BackupHandler.java | 2 ++ .../groovy/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 06874ce8311..0273c3c6a5a 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 @@ -743,6 +743,8 @@ public class BackupHandler extends MasterDaemon implements Writable { } 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 874a0e5c0be..64ebeb03a0a 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) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
