Skip to content

Commit

Permalink
Merge #61208
Browse files Browse the repository at this point in the history
61208: kv: disable race testing of kvserver package r=RaduBerinde a=RaduBerinde

The thread sanitizer dies with a "clock allocator overflow" on this
package. The failure is not specific to a test; we have skipped the
tests that were running and it's now being hit during another test.

I tried splitting out the client tests, but they rely on a lot of
_test code from the `kvserver` package. It requires duplicating or
moving around a lot of code (and making many methods public from
non-test kvserver code).

Until we figure out a solution, I am skipping the entire package under
race.

Informs #61120.

Release justification: non-production code change.

Release note: None

Co-authored-by: Radu Berinde <[email protected]>
  • Loading branch information
craig[bot] and RaduBerinde committed Feb 27, 2021
2 parents dcc8ab0 + ae797e4 commit 4119ed0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 5 additions & 2 deletions pkg/kv/kvserver/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,11 @@ func TestMain(m *testing.M) {
// below-Raft proto tracking in non-race builds, so there is little benefit
// to also doing it in race builds.
if util.RaceEnabled {
os.Exit(m.Run())
return
// This package fails under race with "clock allocator overflow".
// Tracked by #61120.
//os.Exit(m.Run())
fmt.Println("SKIPPED (#61120)")
os.Exit(0)
}

// Create a set of all protos we believe to be marshaled downstream of raft.
Expand Down
4 changes: 0 additions & 4 deletions pkg/kv/kvserver/replica_rangefeed_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ import (
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/sql"
"github.com/cockroachdb/cockroach/pkg/testutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
"github.com/cockroachdb/cockroach/pkg/util/encoding"
Expand Down Expand Up @@ -369,7 +368,6 @@ func TestReplicaRangefeedExpiringLeaseError(t *testing.T) {
func TestReplicaRangefeedRetryErrors(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.UnderRaceWithIssue(t, 61120)

ctx := context.Background()
startKey := []byte("a")
Expand Down Expand Up @@ -775,7 +773,6 @@ func TestReplicaRangefeedRetryErrors(t *testing.T) {
func TestReplicaRangefeedPushesTransactions(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.UnderRaceWithIssue(t, 61120)

ctx := context.Background()
tc, db, desc := setupClusterForClosedTSTesting(ctx, t, testingTargetDuration,
Expand Down Expand Up @@ -890,7 +887,6 @@ func TestReplicaRangefeedPushesTransactions(t *testing.T) {
func TestReplicaRangefeedNudgeSlowClosedTimestamp(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.UnderRaceWithIssue(t, 61120)

ctx := context.Background()
tc, db, desc := setupClusterForClosedTSTesting(ctx, t, testingTargetDuration,
Expand Down

0 comments on commit 4119ed0

Please sign in to comment.