add restoreErr to restore manager

pingcap · Jul 16, 2020 · eaf7392 · eaf7392
1 parent 7fbae14
commit eaf7392
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/cmd/backup-manager/app/restore/manager.go b/cmd/backup-manager/app/restore/manager.go
@@ -235,6 +235,9 @@ func (rm *Manager) performRestore(restore *v1alpha1.Restore, db *sql.DB) error {
 	if oldTikvGCTimeDuration < tikvGCTimeDuration {
 		err = rm.SetTikvGCLifeTime(db, oldTikvGCTime)
 		if err != nil {
+			if restoreErr != nil {
+				errs = append(errs, restoreErr)
+			}
 			errs = append(errs, err)
 			klog.Errorf("cluster %s reset tikv GC life time to %s failed, err: %s", rm, oldTikvGCTime, err)
 			uerr := rm.StatusUpdater.Update(restore, &v1alpha1.RestoreCondition{