Skip to content

Commit

Permalink
kvserver: unskip and deflake TestShowTraceReplica
Browse files Browse the repository at this point in the history
This test asserts on replica placement. By default, the replicate queue
can take up to 10 minutes to execute config changes, which can fail the
test.

This patch speeds up the replicate queue. It also skips the test under
stressrace and deadlock, since it is timing sensitive.

Epic: none
Release note: None
  • Loading branch information
erikgrinaker committed Jul 7, 2023
1 parent 9dda82c commit f9d1409
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/sql/show_trace_replica_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"fmt"
"reflect"
"testing"
"time"

"github.com/cockroachdb/cockroach/pkg/base"
"github.com/cockroachdb/cockroach/pkg/config/zonepb"
Expand All @@ -34,7 +35,8 @@ func TestShowTraceReplica(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

skip.WithIssue(t, 98598)
skip.UnderStressRace(t) // too slow
skip.UnderDeadlock(t) // too slow

const numNodes = 4

Expand All @@ -44,6 +46,7 @@ func TestShowTraceReplica(t *testing.T) {
ctx := context.Background()
tsArgs := func(node string) base.TestServerArgs {
return base.TestServerArgs{
ScanMaxIdleTime: 10 * time.Millisecond, // speed up replicate queue
Knobs: base.TestingKnobs{
Server: &server.TestingKnobs{
DefaultZoneConfigOverride: &zoneConfig,
Expand Down

0 comments on commit f9d1409

Please sign in to comment.