From 3ebb2c1c04bdfd7f1b64b38d8feb4b2b7a110d8c Mon Sep 17 00:00:00 2001 From: Abhishek Pandey Date: Wed, 16 Aug 2023 17:25:35 +0530 Subject: [PATCH] put back dq --- src/internal/operations/backup.go | 60 +++++++++++++++---------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/internal/operations/backup.go b/src/internal/operations/backup.go index 591da2201..a06d09080 100644 --- a/src/internal/operations/backup.go +++ b/src/internal/operations/backup.go @@ -370,40 +370,40 @@ func (op *BackupOperation) do( } // Run 3 times and exit - //cs := []data.BackupCollection{} - //canUsePreviousBackup := false + cs := []data.BackupCollection{} + canUsePreviousBackup := false - //var maxCount int = 2 + var maxCount int = 2 - //for i := 0; i < maxCount; i++ { - //logger.Ctx(ctx).Info("delta query iteration") + for i := 0; i < maxCount; i++ { + logger.Ctx(ctx).Info("delta query iteration") - cs, ssmb, canUsePreviousBackup, err := produceBackupDataCollections( - ctx, - op.bp, - op.ResourceOwner, - op.Selectors, - mdColls, - lastBackupVersion, - op.Options, - op.Errors) - if err != nil { - return nil, clues.Wrap(err, "producing backup data collections") + cs, _, canUsePreviousBackup, err := produceBackupDataCollections( + ctx, + op.bp, + op.ResourceOwner, + op.Selectors, + mdColls, + lastBackupVersion, + op.Options, + op.Errors) + if err != nil { + return nil, clues.Wrap(err, "producing backup data collections") + } + + ctx = clues.Add( + ctx, + "can_use_previous_backup", canUsePreviousBackup, + "collection_count", len(cs)) + + // sleep for 5 mins + //time.Sleep(5 * time.Minute) + + if i == maxCount-1 { + return nil, clues.New("unable to produce backup collections").WithClues(ctx) + } } - ctx = clues.Add( - ctx, - "can_use_previous_backup", canUsePreviousBackup, - "collection_count", len(cs)) - - // sleep for 5 mins - //time.Sleep(5 * time.Minute) - - // if i == maxCount-1 { - // return nil, clues.New("unable to produce backup collections").WithClues(ctx) - // } - //} - writeStats, deets, toMerge, err := consumeBackupCollections( ctx, op.kopia, @@ -411,7 +411,7 @@ func (op *BackupOperation) do( reasons, mans, cs, - ssmb, + nil, backupID, op.incremental && canUseMetadata && canUsePreviousBackup, op.Errors)