opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13325 from rainzm/bugfix/bakcup

Browse Source 
Bugfix/bakcup
This commit is contained in:
Zexi Li
2022-01-26 10:46:55 +08:00
committed by GitHub
parent 3b31abdc66 8d684d3758
commit d75509f887
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/backup.go
+2 -2
View File
@@ -58,8 +58,8 @@ type SDiskBackup struct {
DiskSizeMb int `nullable:"false" list:"user" create:"optional"`
DiskType string `width:"32" charset:"ascii" nullable:"true" list:"user" create:"optional"`
// 操作系统类型
OsType string `width:"32" charset:"ascii" nullable:"true" list:"user" create:"optional"`
DiskConfig *SBackupDiskConfig `ignore:"true"`
OsType string `width:"32" charset:"ascii" nullable:"true" list:"user" create:"optional"`
DiskConfig *SBackupDiskConfig
}
var DiskBackupManager *SDiskBackupManager
pkg/hostman/storageman/storage_local.go
+7
View File
@@ -102,6 +102,13 @@ func (s *SLocalStorage) SyncStorageSize() error {
}
func (s *SLocalStorage) CreateDiskFromBackup(ctx context.Context, disk IDisk, input *SDiskCreateByDiskinfo) error {
info := input.DiskInfo
backupDir := s.GetBackupDir()
if !fileutils2.Exists(backupDir) {
output, err := procutils.NewCommand("mkdir", "-p", backupDir).Output()
if err != nil {
return errors.Wrapf(err, "mkdir %s failed: %s", backupDir, output)
}
}
backupPath := path.Join(s.GetBackupDir(), info.Backup.BackupId)
if !fileutils2.Exists(backupPath) {
_, err := s.storageBackupRecovery(ctx, &SStorageBackup{