From 5434bdbed33d522c56f48736a487bdc10f3fd917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Pier=C5=9Bcionek?= <ppierscionek@gmail.com>
Date: Thu, 3 Oct 2024 11:19:05 +0200
Subject: [PATCH] DeleteLoop exit logic fix

---
 plugin/exporter/idb/cockroach/util/prune.go | 59 +++++++++++----------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/plugin/exporter/idb/cockroach/util/prune.go b/plugin/exporter/idb/cockroach/util/prune.go
index d8af720..2714d24 100644
--- a/plugin/exporter/idb/cockroach/util/prune.go
+++ b/plugin/exporter/idb/cockroach/util/prune.go
@@ -72,37 +72,40 @@ func (p *cdb) DeleteLoop(wg *sync.WaitGroup, nextRound *uint64) {
 
 	// round value used for interval calculation
 	round := *nextRound
-	for {
-		select {
-		case <-p.ctx.Done():
-			return
-		case <-time.After(p.duration):
-			currentRound := *nextRound
-			// keep, remove data older than keep
-			keep := currentRound - p.config.Rounds
-			if p.config.Interval == once {
-				if currentRound > p.config.Rounds {
-					err := p.db.DeleteTransactions(p.ctx, keep)
-					if err != nil {
-						p.logger.Warnf("DeleteLoop(): data pruning err: %v", err)
-					}
-				}
+	func() {
+		for {
+			select {
+			case <-p.ctx.Done():
 				return
-			} else if p.config.Interval > disabled {
-				// *nextRound should increment as exporter receives new block
-				if currentRound > p.config.Rounds && currentRound-round >= uint64(p.config.Interval) {
-					err := p.db.DeleteTransactions(p.ctx, keep)
-					if err != nil {
-						p.logger.Warnf("DeleteLoop(): data pruning err: %v", err)
-						return
+			case <-time.After(p.duration):
+				currentRound := *nextRound
+				// keep, remove data older than keep
+				keep := currentRound - p.config.Rounds
+				if p.config.Interval == once {
+					if currentRound > p.config.Rounds {
+						err := p.db.DeleteTransactions(p.ctx, keep)
+						if err != nil {
+							p.logger.Warnf("DeleteLoop(): data pruning err: %v", err)
+						}
+					}
+					return
+				} else if p.config.Interval > disabled {
+					// *nextRound should increment as exporter receives new block
+					if currentRound > p.config.Rounds && currentRound-round >= uint64(p.config.Interval) {
+						err := p.db.DeleteTransactions(p.ctx, keep)
+						if err != nil {
+							p.logger.Warnf("DeleteLoop(): data pruning err: %v", err)
+						} else {
+							// update round value for next interval calculation
+							round = currentRound
+						}
 					}
-					// update round value for next interval calculation
-					round = currentRound
+				} else {
+					p.logger.Fatalf("DeleteLoop(): unsupported interval value %v", p.config.Interval)
+					return
 				}
-			} else {
-				p.logger.Fatalf("DeleteLoop(): unsupported interval value %v", p.config.Interval)
-				return
 			}
 		}
-	}
+	}()
+	p.logger.Warn("DeleteLoop(): loop terminated")
 }