put back dq

src/internal/operations/backup.go

@@ -370,40 +370,40 @@ func (op *BackupOperation) do(
 	}
 
 	// Run 3 times and exit
-	//cs := []data.BackupCollection{}
+	cs := []data.BackupCollection{}
-	//canUsePreviousBackup := false
+	canUsePreviousBackup := false
 
-	//var maxCount int = 2
+	var maxCount int = 2
 
-	//for i := 0; i < maxCount; i++ {
+	for i := 0; i < maxCount; i++ {
-	//logger.Ctx(ctx).Info("delta query iteration")
+		logger.Ctx(ctx).Info("delta query iteration")
 
-	cs, ssmb, canUsePreviousBackup, err := produceBackupDataCollections(
+		cs, _, canUsePreviousBackup, err := produceBackupDataCollections(
-		ctx,
+			ctx,
-		op.bp,
+			op.bp,
-		op.ResourceOwner,
+			op.ResourceOwner,
-		op.Selectors,
+			op.Selectors,
-		mdColls,
+			mdColls,
-		lastBackupVersion,
+			lastBackupVersion,
-		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, 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)