larryh/corso
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up leftover restorepoint var names (#344)

Browse Source
This commit is contained in:
Keepers 2022-07-14 11:48:14 -06:00 committed by GitHub
parent 105fd7383a
commit bd3b2a8096
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/internal/operations/backup.go
View File

@ -114,14 +114,14 @@ func (op *BackupOperation) createBackupModels(ctx context.Context, snapID string
return errors.Wrap(err, "creating backupdetails model") return errors.Wrap(err, "creating backupdetails model")
} }
rp := backup.New(snapID, string(details.ModelStoreID)) bu := backup.New(snapID, string(details.ModelStoreID))
err = op.modelStore.Put(ctx, kopia.BackupModel, rp) err = op.modelStore.Put(ctx, kopia.BackupModel, bu)
if err != nil { if err != nil {
return errors.Wrap(err, "creating backup model") return errors.Wrap(err, "creating backup model")
} }
op.Results.BackupID = rp.StableID op.Results.BackupID = bu.StableID
return nil return nil
} }

12
src/internal/operations/restore.go
View File

@ -82,15 +82,15 @@ func (op *RestoreOperation) Run(ctx context.Context) error {
defer op.persistResults(time.Now(), &stats) defer op.persistResults(time.Now(), &stats)
// retrieve the restore point details // retrieve the restore point details
rp := backup.Backup{} bu := backup.Backup{}
err := op.modelStore.Get(ctx, kopia.BackupModel, op.BackupID, &rp) err := op.modelStore.Get(ctx, kopia.BackupModel, op.BackupID, &bu)
if err != nil { if err != nil {
stats.readErr = errors.Wrap(err, "retrieving restore point") stats.readErr = errors.Wrap(err, "retrieving restore point")
return stats.readErr return stats.readErr
} }
rpd := backup.Details{} backup := backup.Details{}
err = op.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rp.DetailsID), &rpd) err = op.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(bu.DetailsID), &backup)
if err != nil { if err != nil {
stats.readErr = errors.Wrap(err, "retrieving restore point details") stats.readErr = errors.Wrap(err, "retrieving restore point details")
return stats.readErr return stats.readErr
@ -103,8 +103,8 @@ func (op *RestoreOperation) Run(ctx context.Context) error {
} }
// format the details and retrieve the items from kopia // format the details and retrieve the items from kopia
fds := er.FilterDetails(&rpd) fds := er.FilterDetails(&backup)
dcs, err := op.kopia.RestoreMultipleItems(ctx, rp.SnapshotID, fds) dcs, err := op.kopia.RestoreMultipleItems(ctx, bu.SnapshotID, fds)
if err != nil { if err != nil {
stats.readErr = errors.Wrap(err, "retrieving service data") stats.readErr = errors.Wrap(err, "retrieving service data")
return stats.readErr return stats.readErr

16
src/pkg/repository/repository.go
View File

@ -156,24 +156,24 @@ func (r Repository) Backups(ctx context.Context) ([]*backup.Backup, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
rps := make([]*backup.Backup, 0, len(bms)) bus := make([]*backup.Backup, 0, len(bms))
for _, bm := range bms { for _, bm := range bms {
rp := backup.Backup{} bu := backup.Backup{}
err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupModel, bm.ModelStoreID, &rp) err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupModel, bm.ModelStoreID, &bu)
if err != nil { if err != nil {
return nil, err return nil, err
} }
rps = append(rps, &rp) bus = append(bus, &bu)
} }
return rps, nil return bus, nil
} }
// BackupDetails returns the specified backup details object // BackupDetails returns the specified backup details object
func (r Repository) BackupDetails(ctx context.Context, rpDetailsID string) (*backup.Details, error) { func (r Repository) BackupDetails(ctx context.Context, rpDetailsID string) (*backup.Details, error) {
rpd := backup.Details{} bud := backup.Details{}
err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rpDetailsID), &rpd) err := r.modelStore.GetWithModelStoreID(ctx, kopia.BackupDetailsModel, manifest.ID(rpDetailsID), &bud)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &rpd, nil return &bud, nil
} }