From 5beb93dde2787c267948cc65e12c0d30b77047f3 Mon Sep 17 00:00:00 2001
From: zhengkunwang <31820853+zhengkunwang223@users.noreply.github.com>
Date: Sun, 29 Sep 2024 18:03:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A4=87=E4=BB=BD=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E5=A2=9E=E5=8A=A0=E4=BB=BB=E5=8A=A1=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=20(#6619)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 agent/app/service/backup_app.go | 55 ++++++++++++++++++++-------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/agent/app/service/backup_app.go b/agent/app/service/backup_app.go
index b25063cde..91b5e34de 100644
--- a/agent/app/service/backup_app.go
+++ b/agent/app/service/backup_app.go
@@ -38,25 +38,36 @@ func (u *BackupService) AppBackup(req dto.CommonBackup) (*model.BackupRecord, er
 	backupDir := path.Join(global.CONF.System.Backup, itemDir)
 
 	fileName := fmt.Sprintf("%s_%s.tar.gz", req.DetailName, timeNow+common.RandStrAndNum(5))
-	if err := handleAppBackup(&install, nil, backupDir, fileName, "", req.Secret, req.TaskID); err != nil {
-		return nil, err
+
+	backupApp := func() (*model.BackupRecord, error) {
+		if err = handleAppBackup(&install, nil, backupDir, fileName, "", req.Secret, req.TaskID); err != nil {
+			global.LOG.Errorf("backup app %s failed, err: %v", req.DetailName, err)
+			return nil, err
+		}
+		record := &model.BackupRecord{
+			Type:              "app",
+			Name:              req.Name,
+			DetailName:        req.DetailName,
+			SourceAccountIDs:  "1",
+			DownloadAccountID: 1,
+			FileDir:           itemDir,
+			FileName:          fileName,
+		}
+		if err := backupRepo.CreateRecord(record); err != nil {
+			global.LOG.Errorf("save backup record failed, err: %v", err)
+			return nil, err
+		}
+		return record, nil
 	}
 
-	record := &model.BackupRecord{
-		Type:              "app",
-		Name:              req.Name,
-		DetailName:        req.DetailName,
-		SourceAccountIDs:  "1",
-		DownloadAccountID: 1,
-		FileDir:           itemDir,
-		FileName:          fileName,
+	if req.TaskID != "" {
+		go func() {
+			_, _ = backupApp()
+		}()
+	} else {
+		return backupApp()
 	}
-
-	if err := backupRepo.CreateRecord(record); err != nil {
-		global.LOG.Errorf("save backup record failed, err: %v", err)
-		return nil, err
-	}
-	return record, nil
+	return nil, nil
 }
 
 func (u *BackupService) AppRecover(req dto.CommonRecover) error {
@@ -76,9 +87,11 @@ func (u *BackupService) AppRecover(req dto.CommonRecover) error {
 	if _, err := compose.Down(install.GetComposePath()); err != nil {
 		return err
 	}
-	if err := handleAppRecover(&install, nil, req.File, false, req.Secret, req.TaskID); err != nil {
-		return err
-	}
+	go func() {
+		if err := handleAppRecover(&install, nil, req.File, false, req.Secret, req.TaskID); err != nil {
+			global.LOG.Errorf("recover app %s failed, err: %v", req.DetailName, err)
+		}
+	}()
 	return nil
 }
 
@@ -338,11 +351,11 @@ func handleAppRecover(install *model.AppInstall, parentTask *task.Task, recoverF
 		}
 	}
 
-	recoverTask.AddSubTask(task.GetTaskName(install.Name, task.TaskBackup, task.TaskScopeApp), recoverApp, rollBackApp)
+	recoverTask.AddSubTask(task.GetTaskName(install.Name, task.TaskRecover, task.TaskScopeApp), recoverApp, rollBackApp)
 	if parentTask != nil {
 		return recoverApp(parentTask)
 	}
-	return nil
+	return recoverTask.Execute()
 }
 
 func reCreateDB(dbID uint, database model.Database, oldEnv string) (*model.DatabaseMysql, map[string]interface{}, error) {