diff --git a/backend/app/service/snapshot.go b/backend/app/service/snapshot.go index 5b5a21f05..cc5a6d720 100644 --- a/backend/app/service/snapshot.go +++ b/backend/app/service/snapshot.go @@ -265,17 +265,23 @@ func (u *SnapshotService) HandleSnapshot(isCronjob bool, logPath string, req dto _ = snapshotRepo.Update(snap.ID, map[string]interface{}{"status": constant.StatusFailed}) return } - snapPanelData(itemHelper, localDir, backupPanelDir) + if snapStatus.PanelData != constant.StatusDone { + snapPanelData(itemHelper, localDir, backupPanelDir) + } if snapStatus.PanelData != constant.StatusDone { _ = snapshotRepo.Update(snap.ID, map[string]interface{}{"status": constant.StatusFailed}) return } - snapCompress(itemHelper, rootDir) + if snapStatus.Compress != constant.StatusDone { + snapCompress(itemHelper, rootDir) + } if snapStatus.Compress != constant.StatusDone { _ = snapshotRepo.Update(snap.ID, map[string]interface{}{"status": constant.StatusFailed}) return } - snapUpload(itemHelper, req.From, fmt.Sprintf("%s.tar.gz", rootDir)) + if snapStatus.Upload != constant.StatusDone { + snapUpload(itemHelper, req.From, fmt.Sprintf("%s.tar.gz", rootDir)) + } if snapStatus.Upload != constant.StatusDone { _ = snapshotRepo.Update(snap.ID, map[string]interface{}{"status": constant.StatusFailed}) return diff --git a/backend/utils/cloud_storage/client/onedrive.go b/backend/utils/cloud_storage/client/onedrive.go index 3f37407d2..5a5a65acd 100644 --- a/backend/utils/cloud_storage/client/onedrive.go +++ b/backend/utils/cloud_storage/client/onedrive.go @@ -116,7 +116,7 @@ func (o oneDriveClient) Upload(src, target string) (bool, error) { } var isOk bool if fileInfo.Size() < 4*1024*1024 { - isOk, err = o.upSmall(ctx, src, folderID, fileInfo.Size()) + isOk, err = o.upSmall(src, folderID, fileInfo.Size()) } else { isOk, err = o.upBig(ctx, src, folderID, fileInfo.Size()) } @@ -300,7 +300,7 @@ func (o *oneDriveClient) NewSessionFileUploadRequest(absoluteUrl string, grandOf return req, err } -func (o *oneDriveClient) upSmall(ctx context.Context, srcPath, folderID string, fileSize int64) (bool, error) { +func (o *oneDriveClient) upSmall(srcPath, folderID string, fileSize int64) (bool, error) { file, err := os.Open(srcPath) if err != nil { return false, err