Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dataroaring merged 1 commit into from
May 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions fe/fe-core/src/main/java/org/apache/doris/backup/BackupHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
10 changes: 6 additions & 4 deletions regression-test/framework/src/main/groovy/org/apache/doris/regression/suite/Syncer.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down