additional logs (hopefully helpful)

Author: FGasper

internal/verifier/migration_verifier.go

@@ -567,10 +567,14 @@ func (verifier *Verifier) compareOneDocument(srcClientDoc, dstClientDoc bson.Raw
 func (verifier *Verifier) ProcessVerifyTask(ctx context.Context, workerNum int, task *VerificationTask) error {
 	start := time.Now()
 
-	verifier.logger.Debug().
+	debugLog := verifier.logger.Debug().
 		Int("workerNum", workerNum).
 		Interface("task", task.PrimaryKey).
-		Msg("Processing document comparison task.")
+		Str("namespace", task.QueryFilter.Namespace)
+
+	task.augmentLogWithDetails(debugLog)
+
+	debugLog.Msg("Processing document comparison task.")
 
 	problems, docsCount, bytesCount, err := verifier.FetchAndCompareDocuments(
 		ctx,
@@ -662,6 +666,7 @@ func (verifier *Verifier) ProcessVerifyTask(ctx context.Context, workerNum int,
 	verifier.logger.Debug().
 		Int("workerNum", workerNum).
 		Interface("task", task.PrimaryKey).
+		Str("namespace", task.QueryFilter.Namespace).
 		Stringer("timeElapsed", time.Since(start)).
 		Msg("Finished document comparison task.")
 

internal/verifier/recheck.go

@@ -232,7 +232,8 @@ func (verifier *Verifier) GenerateRecheckTasks(ctx context.Context) error {
 	var prevDBName, prevCollName string
 	var idAccum []interface{}
 	var idLenAccum int
-	var dataSizeAccum int64
+	var totalDocs types.DocumentCount
+	var dataSizeAccum, totalRecheckData int64
 
 	maxDocsPerTask := rechecksCount / int64(verifier.numWorkers)
 
@@ -260,7 +261,7 @@ func (verifier *Verifier) GenerateRecheckTasks(ctx context.Context) error {
 
 		namespace := prevDBName + "." + prevCollName
 
-		err := verifier.InsertDocumentRecheckTask(
+		task, err := verifier.InsertDocumentRecheckTask(
 			ctx,
 			idAccum,
 			types.ByteCount(dataSizeAccum),
@@ -276,6 +277,7 @@ func (verifier *Verifier) GenerateRecheckTasks(ctx context.Context) error {
 		}
 
 		verifier.logger.Debug().
+			Interface("task", task.PrimaryKey).
 			Str("namespace", namespace).
 			Int("numDocuments", len(idAccum)).
 			Str("dataSize", reportutils.FmtBytes(dataSizeAccum)).
@@ -323,12 +325,25 @@ func (verifier *Verifier) GenerateRecheckTasks(ctx context.Context) error {
 		idLenAccum += idLen
 		dataSizeAccum += int64(doc.DataSize)
 		idAccum = append(idAccum, doc.PrimaryKey.DocumentID)
+
+		totalRecheckData += int64(doc.DataSize)
+		totalDocs++
 	}
 
 	err = cursor.Err()
 	if err != nil {
 		return err
 	}
 
-	return persistBufferedRechecks()
+	err = persistBufferedRechecks()
+
+	if err == nil && totalDocs > 0 {
+		verifier.logger.Info().
+			Int("generation", 1+prevGeneration).
+			Int64("totalDocs", int64(totalDocs)).
+			Str("totalData", reportutils.FmtBytes(totalRecheckData)).
+			Msg("Scheduled documents for recheck in the new generation.")
+	}
+
+	return err
 }

internal/verifier/verification_task.go

@@ -14,6 +14,7 @@ import (
 
 	"github.com/10gen/migration-verifier/internal/partitions"
 	"github.com/10gen/migration-verifier/internal/types"
+	"github.com/rs/zerolog"
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"go.mongodb.org/mongo-driver/mongo/options"
@@ -82,6 +83,16 @@ type VerificationTask struct {
 	SourceByteCount types.ByteCount `bson:"source_bytes_count"`
 }
 
+func (t *VerificationTask) augmentLogWithDetails(evt *zerolog.Event) {
+	if len(t.Ids) > 0 {
+		evt.Int("documentCount", len(t.Ids))
+	} else {
+		evt.
+			Interface("minDocID", t.QueryFilter.Partition.Key.Lower).
+			Interface("maxDocID", t.QueryFilter.Partition.Upper)
+	}
+}
+
 // VerificationRange stores ID ranges for tasks that can be re-used between runs
 type VerificationRange struct {
 	PrimaryKey primitive.ObjectID `bson:"_id"`
@@ -167,13 +178,13 @@ func (verifier *Verifier) InsertDocumentRecheckTask(
 	ids []interface{},
 	dataSize types.ByteCount,
 	srcNamespace string,
-) error {
+) (VerificationTask, error) {
 	dstNamespace := srcNamespace
 	if verifier.nsMap.Len() != 0 {
 		var ok bool
 		dstNamespace, ok = verifier.nsMap.GetDstNamespace(srcNamespace)
 		if !ok {
-			return fmt.Errorf("Could not find Namespace %s", srcNamespace)
+			return VerificationTask{}, fmt.Errorf("Could not find Namespace %s", srcNamespace)
 		}
 	}
 
@@ -192,7 +203,7 @@ func (verifier *Verifier) InsertDocumentRecheckTask(
 	}
 
 	_, err := verifier.verificationTaskCollection().InsertOne(ctx, &verificationTask)
-	return err
+	return verificationTask, err
 }
 
 func (verifier *Verifier) FindNextVerifyTaskAndUpdate(ctx context.Context) (*VerificationTask, error) {