From f0d8b2e98b719972bae5fd5835fb254c593ad231 Mon Sep 17 00:00:00 2001 From: Erik Grinaker Date: Tue, 18 May 2021 11:34:03 +0000 Subject: [PATCH] kvserver: deflake TestReliableIntentCleanup Release note: None --- pkg/kv/kvserver/intent_resolver_integration_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/kv/kvserver/intent_resolver_integration_test.go b/pkg/kv/kvserver/intent_resolver_integration_test.go index 0d8b4c97b61c..a6f712e62114 100644 --- a/pkg/kv/kvserver/intent_resolver_integration_test.go +++ b/pkg/kv/kvserver/intent_resolver_integration_test.go @@ -219,8 +219,8 @@ func TestRollbackSyncRangedIntentResolution(t *testing.T) { func TestReliableIntentCleanup(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) - skip.UnderRace(t) - skip.UnderStress(t) + skip.UnderRace(t, "timing-sensitive test") + skip.UnderStress(t, "multi-node test") testutils.RunTrueAndFalse(t, "ForceSyncIntentResolution", func(t *testing.T, sync bool) { ctx := context.Background() @@ -283,8 +283,8 @@ func TestReliableIntentCleanup(t *testing.T) { hlc.MaxTimestamp, storage.MVCCScanOptions{Inconsistent: true}) require.NoError(t, err) return len(result.Intents) == 0 - }, 10*time.Second, 100*time.Millisecond, "intent cleanup timed out") { - require.Fail(t, "found stale intents", "%v", len(result.Intents)) + }, 30*time.Second, 200*time.Millisecond, "intent cleanup timed out") { + require.Fail(t, "found stale intents", "%v intents", len(result.Intents)) } } @@ -299,7 +299,7 @@ func TestReliableIntentCleanup(t *testing.T) { storage.MVCCGetOptions{}) require.NoError(t, err) return !ok - }, 5*time.Second, 100*time.Millisecond, "txn entry cleanup timed out") { + }, 10*time.Second, 100*time.Millisecond, "txn entry cleanup timed out") { require.Fail(t, "found stale txn entry", "%v", txnEntry) } }