gh_mirrors/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2025-01-31 14:08:06 +08:00
Code

fix: 解决快照恢复失败的问题 (#5739)

Browse Source
This commit is contained in:
ssongliu 2024-07-10 12:09:24 +08:00 committed by GitHub
parent af9aef4d34
commit 5f2cfe6e20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/app/dto/container.go
View File

@ -8,7 +8,7 @@ type PageContainer struct {
PageInfo PageInfo
Name string `json:"name"` Name string `json:"name"`
State string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"` State string `json:"state" validate:"required,oneof=all created running paused restarting removing exited dead"`
OrderBy string `json:"orderBy" validate:"required,oneof=name status created_at"` OrderBy string `json:"orderBy" validate:"required,oneof=name state created_at"`
Order string `json:"order" validate:"required,oneof=null ascending descending"` Order string `json:"order" validate:"required,oneof=null ascending descending"`
Filters string `json:"filters"` Filters string `json:"filters"`
ExcludeAppStore bool `json:"excludeAppStore"` ExcludeAppStore bool `json:"excludeAppStore"`

2
backend/app/service/snapshot_recover.go
View File

@ -74,7 +74,7 @@ func (u *SnapshotService) HandleSnapshotRecover(snap model.Snapshot, isRecover b
req.IsNew = true req.IsNew = true
} }
if isRecover && (req.IsNew || snap.InterruptStep == "AppData") { if isRecover && (req.IsNew || snap.InterruptStep == "AppData") {
if err := recoverAppData(snapFileDir); err == nil { if err := recoverAppData(snapFileDir); err != nil {
updateRecoverStatus(snap.ID, isRecover, "DockerDir", constant.StatusFailed, fmt.Sprintf("handle recover app data failed, err: %v", err)) updateRecoverStatus(snap.ID, isRecover, "DockerDir", constant.StatusFailed, fmt.Sprintf("handle recover app data failed, err: %v", err))
return return
} }