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

Wire up setting lineage on backup models

Browse Source 
Also minor test fixups.
This commit is contained in:
Ashlie Martinez 2023-10-04 13:43:07 -07:00
parent ad5d77f6f8
commit ffcc4e1bb8
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -278,7 +278,7 @@ func (op *BackupOperation) Run(ctx context.Context) (err error) {
observe.Message(ctx, "Backing Up", observe.Bullet, clues.Hide(op.ResourceOwner.Name())) observe.Message(ctx, "Backing Up", observe.Bullet, clues.Hide(op.ResourceOwner.Name()))
deets, err := op.do( bases, deets, err := op.do(
ctx, ctx,
&opStats, &opStats,
sstore, sstore,
@ -304,6 +304,7 @@ func (op *BackupOperation) Run(ctx context.Context) (err error) {
err = op.createBackupModels( err = op.createBackupModels(
ctx, ctx,
sstore, sstore,
bases,
opStats, opStats,
op.Results.BackupID, op.Results.BackupID,
op.BackupVersion, op.BackupVersion,
@ -329,17 +330,17 @@ func (op *BackupOperation) do(
opStats *backupStats, opStats *backupStats,
detailsStore streamstore.Streamer, detailsStore streamstore.Streamer,
backupID model.StableID, backupID model.StableID,
) (*details.Builder, error) { ) (backup.BackupBases, *details.Builder, error) {
lastBackupVersion := version.NoBackup lastBackupVersion := version.NoBackup
reasons, err := op.Selectors.Reasons(op.account.ID(), false) reasons, err := op.Selectors.Reasons(op.account.ID(), false)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "getting reasons") return nil, nil, clues.Wrap(err, "getting reasons")
} }
fallbackReasons, err := makeFallbackReasons(op.account.ID(), op.Selectors) fallbackReasons, err := makeFallbackReasons(op.account.ID(), op.Selectors)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "getting fallback reasons") return nil, nil, clues.Wrap(err, "getting fallback reasons")
} }
logger.Ctx(ctx).With( logger.Ctx(ctx).With(
@ -352,7 +353,7 @@ func (op *BackupOperation) do(
kbf, err := op.kopia.NewBaseFinder(op.store) kbf, err := op.kopia.NewBaseFinder(op.store)
if err != nil { if err != nil {
return nil, clues.Stack(err) return nil, nil, clues.Stack(err)
} }
bases, mdColls, canUseMetadata, err := produceManifestsAndMetadata( bases, mdColls, canUseMetadata, err := produceManifestsAndMetadata(
@ -365,7 +366,7 @@ func (op *BackupOperation) do(
op.incremental, op.incremental,
op.disableAssistBackup) op.disableAssistBackup)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "producing manifests and metadata") return nil, nil, clues.Wrap(err, "producing manifests and metadata")
} }
ctx = clues.Add( ctx = clues.Add(
@ -392,7 +393,7 @@ func (op *BackupOperation) do(
op.Options, op.Options,
op.Errors) op.Errors)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "producing backup data collections") return nil, nil, clues.Wrap(err, "producing backup data collections")
} }
ctx = clues.Add( ctx = clues.Add(
@ -412,7 +413,7 @@ func (op *BackupOperation) do(
op.incremental && canUseMetadata && canUsePreviousBackup, op.incremental && canUseMetadata && canUsePreviousBackup,
op.Errors) op.Errors)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "persisting collection backups") return nil, nil, clues.Wrap(err, "persisting collection backups")
} }
opStats.hasNewDetailEntries = (deets != nil && !deets.Empty()) || opStats.hasNewDetailEntries = (deets != nil && !deets.Empty()) ||
@ -429,14 +430,14 @@ func (op *BackupOperation) do(
op.Selectors.PathService(), op.Selectors.PathService(),
op.Errors) op.Errors)
if err != nil { if err != nil {
return nil, clues.Wrap(err, "merging details") return nil, nil, clues.Wrap(err, "merging details")
} }
opStats.ctrl = op.bp.Wait() opStats.ctrl = op.bp.Wait()
logger.Ctx(ctx).Debug(opStats.ctrl) logger.Ctx(ctx).Debug(opStats.ctrl)
return deets, nil return bases, deets, nil
} }
func makeFallbackReasons(tenant string, sel selectors.Selector) ([]identity.Reasoner, error) { func makeFallbackReasons(tenant string, sel selectors.Selector) ([]identity.Reasoner, error) {
@ -929,6 +930,7 @@ func (op *BackupOperation) createBackupModels(
op.ResourceOwner.Name(), op.ResourceOwner.Name(),
op.Results.ReadWrites, op.Results.ReadWrites,
op.Results.StartAndEndTime, op.Results.StartAndEndTime,
bases,
op.Errors.Errors(), op.Errors.Errors(),
tags) tags)

1
src/pkg/repository/repository_unexported_test.go
View File

@ -822,6 +822,7 @@ func writeBackup(
ownerID, ownerName, ownerID, ownerName,
stats.ReadWrites{}, stats.ReadWrites{},
stats.StartAndEndTime{}, stats.StartAndEndTime{},
nil,
fe, fe,
tags) tags)