From 77213957488aea6075c50febce6b34a7c9b303a6 Mon Sep 17 00:00:00 2001 From: ssongliu <73214554+ssongliu@users.noreply.github.com> Date: Mon, 7 Aug 2023 15:10:26 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=BF=AB=E7=85=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=88=A4=E6=96=AD=20(#1862)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/app/service/snapshot.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/app/service/snapshot.go b/backend/app/service/snapshot.go index d175e986c..bff6f72c6 100644 --- a/backend/app/service/snapshot.go +++ b/backend/app/service/snapshot.go @@ -303,8 +303,8 @@ func (u *SnapshotService) SnapshotRecover(req dto.SnapshotRecover) error { recoverPanelDir := fmt.Sprintf("%s/%s/1panel", baseDir, snap.Name) liveRestore := false - if !isReTry && !isNewSnapshot { - if snap.InterruptStep == "LoadDockerJson" { + if !isNewSnapshot { + if !isReTry || snap.InterruptStep == "LoadDockerJson" { snapJson.OldDockerDataDir, liveRestore, err = u.loadDockerDataDir() if err != nil { updateRecoverStatus(snap.ID, "LoadDockerJson", constant.StatusFailed, fmt.Sprintf("load docker data dir failed, err: %v", err)) @@ -322,7 +322,7 @@ func (u *SnapshotService) SnapshotRecover(req dto.SnapshotRecover) error { _ = u.saveJson(snapJson, rootDir) _, _ = cmd.Exec("systemctl stop docker") - if snap.InterruptStep == "DockerDir" { + if !isReTry || snap.InterruptStep == "DockerDir" { if err := u.handleDockerDatas(fileOp, operation, rootDir, snapJson.DockerDataDir); err != nil { updateRecoverStatus(snap.ID, "DockerDir", constant.StatusFailed, err.Error()) return