Merge #68808

68808: kv: deflake and unskip TestMergeQueue/sticky-bit-expiration r=nvanbenschoten a=nvanbenschoten Fixes #66942. This was broken by 78078b8, which switched the test from using a `ManualClock` to using a `HybridManualClock`. Co-authored-by: Nathan VanBenschoten <[email protected]>
cockroachdb · Aug 13, 2021 · 7018384 · 7018384
2 parents 3928f19 + b333424
commit 7018384
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 8 deletions.
diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go
@@ -4422,14 +4422,19 @@ func TestMergeQueue(t *testing.T) {
 	})
 
 	t.Run("sticky-bit-expiration", func(t *testing.T) {
-		skip.WithIssue(t, 66942, "flakey test")
-		manualSplitTTL := time.Millisecond * 200
+		manualSplitTTL := 10 * time.Millisecond
 		reset(t)
 		store.MustForceMergeScanAndProcess()
 		verifyUnmerged(t, store, lhsStartKey, rhsStartKey)
 
+		// Pause the clock for the duration of this subtest so that
+		// the sticky bit does not expire prematurely.
+		manualClock.Pause()
+		defer manualClock.Resume()
+
 		// Perform manual merge and verify that no merge occurred.
-		split(t, rhsStartKey.AsRawKey(), tc.Servers[0].Clock().Now().Add(manualSplitTTL.Nanoseconds(), 0) /* expirationTime */)
+		exp := tc.Servers[0].Clock().Now().Add(manualSplitTTL.Nanoseconds(), 0)
+		split(t, rhsStartKey.AsRawKey(), exp /* expirationTime */)
 		clearRange(t, lhsStartKey, rhsEndKey)
 		store.MustForceMergeScanAndProcess()
 		verifyUnmerged(t, store, lhsStartKey, rhsStartKey)

diff --git a/pkg/util/hlc/hlc.go b/pkg/util/hlc/hlc.go
@@ -172,6 +172,14 @@ func (m *HybridManualClock) Pause() {
 	m.mu.Unlock()
 }
 
+// Resume resumes the hybrid manual clock; the passage of time continues to
+// cause clock to tick.
+func (m *HybridManualClock) Resume() {
+	m.mu.Lock()
+	m.mu.nanosAtPause = 0
+	m.mu.Unlock()
+}
+
 // UnixNano returns the local machine's physical nanosecond
 // unix epoch timestamp as a convenience to create a HLC via
 // c := hlc.NewClock(hlc.UnixNano, ...).

diff --git a/pkg/util/hlc/hlc_test.go b/pkg/util/hlc/hlc_test.go
@@ -373,9 +373,10 @@ func TestHybridManualClock(t *testing.T) {
 	require.LessOrEqual(t, c.Now().WallTime, UnixNano())
 	require.LessOrEqual(t, UnixNano(), c.Now().WallTime)
 
-	m.Increment(10)
-	require.LessOrEqual(t, c.Now().WallTime, UnixNano()+10)
-	require.LessOrEqual(t, UnixNano()+10, c.Now().WallTime)
+	inc := time.Second.Nanoseconds()
+	m.Increment(inc)
+	require.LessOrEqual(t, c.Now().WallTime, UnixNano()+inc)
+	require.LessOrEqual(t, UnixNano()+inc, c.Now().WallTime)
 }
 
 // TestHybridManualClockPause test the Pause() functionality of the
@@ -391,8 +392,14 @@ func TestHybridManualClockPause(t *testing.T) {
 	require.Equal(t, now, c.Now().WallTime)
 	time.Sleep(10 * time.Millisecond)
 	require.Equal(t, now, c.Now().WallTime)
-	m.Increment(10)
-	require.Equal(t, now+10, c.Now().WallTime)
+	inc := time.Second.Nanoseconds()
+	m.Increment(inc)
+	require.Equal(t, now+inc, c.Now().WallTime)
+	m.Resume()
+	trueNow := UnixNano()
+	require.LessOrEqual(t, trueNow+inc, c.Now().WallTime)
+	time.Sleep(10 * time.Millisecond)
+	require.Less(t, trueNow+inc, c.Now().WallTime)
 }
 
 func TestHLCMonotonicityCheck(t *testing.T) {