Add epoch info to watch merger

Signed-off-by: Gao Hongtao <[email protected]>
apache · Sep 13, 2024 · 7592db5 · 7592db5
1 parent b5aa1c7
commit 7592db5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/banyand/measure/merger.go b/banyand/measure/merger.go
@@ -53,6 +53,7 @@ func (tst *tsTable) mergeLoop(merges chan *mergerIntroduction, flusherNotifier w
 					return false
 				}
 				defer curSnapshot.decRef()
+				tst.l.Logger.Warn().Msgf("mergeLoop: cur %d merge %d", curSnapshot.epoch, epoch)
 				if curSnapshot.epoch != epoch {
 					tst.incTotalMergeLoopStarted(1)
 					defer tst.incTotalMergeLoopFinished(1)

diff --git a/banyand/measure/tstable_test.go b/banyand/measure/tstable_test.go
@@ -342,8 +342,8 @@ func Test_tstIter(t *testing.T) {
 									snp.decRef()
 									break OUTER
 								}
-								t.Logf("waiting for snapshot %d to be flushed or merged: current creator:%d, parts: %+v",
-									i, snp.creator, snp.parts)
+								t.Logf("waiting for snapshot %d(%d) to be flushed or merged: current creator:%d, parts: %+v",
+									i, snp.creator, snp.epoch, snp.parts)
 								snp.decRef()
 								time.Sleep(100 * time.Millisecond)
 							}
@@ -367,7 +367,7 @@ func Test_tstIter(t *testing.T) {
 									snp.decRef()
 									break OUTER1
 								}
-								t.Logf("waiting for snapshot to be merged: current creator:%d, parts: %+v", snp.creator, snp.parts)
+								t.Logf("waiting for snapshot to be merged: current creator:%d(%d), parts: %+v", snp.creator, snp.epoch, snp.parts)
 								snp.decRef()
 								time.Sleep(100 * time.Millisecond)
 							}

diff --git a/banyand/stream/merger.go b/banyand/stream/merger.go
@@ -53,6 +53,7 @@ func (tst *tsTable) mergeLoop(merges chan *mergerIntroduction, flusherNotifier w
 					return false
 				}
 				defer curSnapshot.decRef()
+				tst.l.Logger.Warn().Msgf("mergeLoop: cur %d merge %d", curSnapshot.epoch, epoch)
 				if curSnapshot.epoch != epoch {
 					tst.incTotalMergeLoopStarted(1)
 					defer tst.incTotalMergeLoopFinished(1)

diff --git a/banyand/stream/tstable_test.go b/banyand/stream/tstable_test.go
@@ -328,8 +328,8 @@ func Test_tstIter(t *testing.T) {
 									snp.decRef()
 									break OUTER
 								}
-								t.Logf("waiting for snapshot %d to be flushed or merged: current creator:%d, parts: %+v",
-									i, snp.creator, snp.parts)
+								t.Logf("waiting for snapshot %d(%d) to be flushed or merged: current creator:%d, parts: %+v",
+									i, snp.creator, snp.epoch, snp.parts)
 								snp.decRef()
 								time.Sleep(100 * time.Millisecond)
 							}
@@ -353,7 +353,7 @@ func Test_tstIter(t *testing.T) {
 									snp.decRef()
 									break OUTER1
 								}
-								t.Logf("waiting for snapshot to be merged: current creator:%d, parts: %+v", snp.creator, snp.parts)
+								t.Logf("waiting for snapshot to be merged: current creator:%d(%d), parts: %+v", snp.creator, snp.epoch, snp.parts)
 								snp.decRef()
 								time.Sleep(100 * time.Millisecond)
 							}