From 10e35c3408cdbef29a9d1241746768ab9e7e54a9 Mon Sep 17 00:00:00 2001
From: Keenan Nemetz <keenan.nemetz@gmail.com>
Date: Thu, 13 Jun 2024 16:26:41 -0700
Subject: [PATCH] remove retry count from dag message.

---
 events/dag_sync.go   |  2 --
 internal/db/merge.go | 23 +++++++++++++++--------
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/events/dag_sync.go b/events/dag_sync.go
index b8f0137ba2..d6150c9118 100644
--- a/events/dag_sync.go
+++ b/events/dag_sync.go
@@ -31,6 +31,4 @@ type DAGMerge struct {
 	// Wg is a wait group that can be used to synchronize the merge,
 	// allowing the caller to optionnaly block until the merge is complete.
 	Wg *sync.WaitGroup
-	// RetryCount is the number of times this merge has been retried due to a conflict.
-	RetryCount int
 }
diff --git a/internal/db/merge.go b/internal/db/merge.go
index 63a728e38c..ef10ea62c4 100644
--- a/internal/db/merge.go
+++ b/internal/db/merge.go
@@ -49,19 +49,26 @@ func (db *db) handleMerges(ctx context.Context, merges events.Subscription[event
 				queue.add(merge.DocID)
 				defer queue.done(merge.DocID)
 
+				var err error
 				// retry merge up to max txn retries
 				for i := 0; i < db.MaxTxnRetries(); i++ {
-					err := db.executeMerge(ctx, merge)
+					err = db.executeMerge(ctx, merge)
 					if errors.Is(err, badger.ErrTxnConflict) {
 						continue // retry merge
 					}
-					if err != nil {
-						log.ErrorContextE(ctx, "Failed to execute merge", err, corelog.Any("Merge", merge))
-					}
-					if merge.Wg != nil {
-						merge.Wg.Done()
-					}
-					break // merge completed
+					break // merge success or error
+				}
+
+				if err != nil {
+					log.ErrorContextE(
+						ctx,
+						"Failed to execute merge",
+						err,
+						corelog.Any("Error", err),
+						corelog.Any("Event", merge))
+				}
+				if merge.Wg != nil {
+					merge.Wg.Done()
 				}
 			}()
 		}