Skip to content
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

refine export cleaner #2916

Merged
merged 6 commits into from
Jul 14, 2020
Merged

refine export cleaner #2916

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bba58f1
refine export cleaner
lichunzhu Jul 13, 2020
94122da
Merge branch 'master' into refineExportCleaner
lichunzhu Jul 13, 2020
3852623
address comment
lichunzhu Jul 13, 2020
4f7c349
Merge branch 'refineExportCleaner' of https://github.com/lichunzhu/ti…
lichunzhu Jul 13, 2020
537cfa2
Merge branch 'master' into refineExportCleaner
lichunzhu Jul 14, 2020
99cbf17
Merge branch 'master' into refineExportCleaner
lichunzhu Jul 14, 2020
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
6 changes: 6 additions & 0 deletions cmd/backup-manager/app/clean/clean.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,12 @@ func (bo *Options) cleanRemoteBackupData(bucket string, opts []string) error {
args := util.ConstructArgs(constants.RcloneConfigArg, opts, "deletefile", destBucket, "")
output, err := exec.Command("rclone", args...).CombinedOutput()
if err != nil {
if exitError, ok := err.(*exec.ExitError); ok {
if code := exitError.ExitCode(); code == 3 || code == 4 {
klog.Infof("cluster %s backup %s has already been deleted before", bo, bucket)
return nil
}
}
return fmt.Errorf("cluster %s, execute rclone deletefile command failed, output: %s, err: %v", bo, string(output), err)
}

Expand Down