From 23e8dc9902023506062f14113b4a9ea07c2b82b2 Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Thu, 23 Sep 2021 09:36:46 -0600 Subject: [PATCH 1/2] Fix corrupt wal test that was flapping Signed-off-by: Ivan Kozlovic --- server/norace_test.go | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/server/norace_test.go b/server/norace_test.go index c7afbadf..c5be3314 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -3340,23 +3340,26 @@ func TestNoRaceJetStreamClusterCorruptWAL(t *testing.T) { nc, js = jsClientConnect(t, c.randomServer()) defer nc.Close() - ci, err := js.ConsumerInfo("TEST", "dlc") - if err != nil { - t.Fatalf("Unexpected error: %v", err) - } - if ci.Delivered.Consumer != ci.Delivered.Stream || ci.Delivered.Consumer != delivered { - t.Fatalf("Expected %d for delivered, got %+v", delivered, ci.Delivered) - } - if ci.AckFloor.Consumer != ci.AckFloor.Stream || ci.AckFloor.Consumer != ackFloor { - t.Fatalf("Expected %d for ack floor, got %+v", ackFloor, ci.AckFloor) - } - nm := uint64(numMsgs) - if ci.NumPending != nm-delivered { - t.Fatalf("Expected num pending to be %d, got %d", nm-delivered, ci.NumPending) - } - if ci.NumAckPending != ackPending { - t.Fatalf("Expected num ack pending to be %d, got %d", ackPending, ci.NumAckPending) - } + checkFor(t, time.Second, 50*time.Millisecond, func() error { + ci, err := js.ConsumerInfo("TEST", "dlc") + if err != nil { + return fmt.Errorf("Unexpected error: %v", err) + } + if ci.Delivered.Consumer != ci.Delivered.Stream || ci.Delivered.Consumer != delivered { + return fmt.Errorf("Expected %d for delivered, got %+v", delivered, ci.Delivered) + } + if ci.AckFloor.Consumer != ci.AckFloor.Stream || ci.AckFloor.Consumer != ackFloor { + return fmt.Errorf("Expected %d for ack floor, got %+v", ackFloor, ci.AckFloor) + } + nm := uint64(numMsgs) + if ci.NumPending != nm-delivered { + return fmt.Errorf("Expected num pending to be %d, got %d", nm-delivered, ci.NumPending) + } + if ci.NumAckPending != ackPending { + return fmt.Errorf("Expected num ack pending to be %d, got %d", ackPending, ci.NumAckPending) + } + return nil + }) } checkConsumer := func() { From 7b257559807b477ce4786b67f85ecaf3a8ca3d2d Mon Sep 17 00:00:00 2001 From: Ivan Kozlovic Date: Thu, 23 Sep 2021 09:56:42 -0600 Subject: [PATCH 2/2] Adjust timing Signed-off-by: Ivan Kozlovic --- server/norace_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/norace_test.go b/server/norace_test.go index c5be3314..c772bd94 100644 --- a/server/norace_test.go +++ b/server/norace_test.go @@ -3340,7 +3340,7 @@ func TestNoRaceJetStreamClusterCorruptWAL(t *testing.T) { nc, js = jsClientConnect(t, c.randomServer()) defer nc.Close() - checkFor(t, time.Second, 50*time.Millisecond, func() error { + checkFor(t, 5*time.Second, 100*time.Millisecond, func() error { ci, err := js.ConsumerInfo("TEST", "dlc") if err != nil { return fmt.Errorf("Unexpected error: %v", err)