Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

multiregionccl: unskip TestMultiRegionAfterEnterpriseDisabled #62116

Merged
merged 2 commits into from
Mar 18, 2021

Conversation

otan
Copy link
Contributor

@otan otan commented Mar 16, 2021

Relevant fixes are now committed.

Resolves #61163

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@otan otan requested review from ajstorm and a team March 16, 2021 23:34
Copy link
Collaborator

@ajstorm ajstorm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 1 of 1 files at r1.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @otan)

@otan
Copy link
Contributor Author

otan commented Mar 17, 2021

bors r=ajstorm

@craig
Copy link
Contributor

craig bot commented Mar 17, 2021

Build failed:

@otan
Copy link
Contributor Author

otan commented Mar 17, 2021

hilarious, it failed!

otan added 2 commits March 18, 2021 11:49
This seems to race:

```
WARNING: DATA RACE
Write at 0x00000bd3e950 by goroutine 38:
  github.com/cockroachdb/cockroach/pkg/ccl/utilccl.TestingDisableEnterprise()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/utilccl/license_check.go:61 +0x59
  github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl_test.TestMultiRegionAfterEnterpriseDisabled()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl/multiregion_test.go:75 +0x48e
  github.com/cockroachdb/cockroach/pkg/testutils/testcluster.(*TestCluster).Start()
      /go/src/github.com/cockroachdb/cockroach/pkg/testutils/testcluster/testcluster.go:338 +0x8eb
  github.com/cockroachdb/cockroach/pkg/testutils/testcluster.(*TestCluster).Start()
      /go/src/github.com/cockroachdb/cockroach/pkg/testutils/testcluster/testcluster.go:295 +0x2dc
  github.com/cockroachdb/cockroach/pkg/testutils/serverutils.StartNewTestCluster()
      /go/src/github.com/cockroachdb/cockroach/pkg/testutils/serverutils/test_cluster_shim.go:210 +0x19b
  github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl/multiregionccltestutils.TestingCreateMultiRegionCluster()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl/multiregionccltestutils/testutils.go:50 +0x537
  github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl_test.TestMultiRegionAfterEnterpriseDisabled()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/multiregionccl/multiregion_test.go:56 +0x1c4
  testing.tRunner()
      /usr/local/go/src/testing/testing.go:1123 +0x202

Previous read at 0x00000bd3e950 by goroutine 918:
  github.com/cockroachdb/cockroach/pkg/ccl/utilccl.CheckEnterpriseEnabled()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/utilccl/license_check.go:71 +0x54
  github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl.checkEnterpriseEnabled()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl/followerreads.go:75 +0xab
  github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl.checkFollowerReadsEnabled()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl/followerreads.go:82 +0x79
  github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl.canSendToFollower()
      /go/src/github.com/cockroachdb/cockroach/pkg/ccl/kvccl/kvfollowerreadsccl/followerreads.go:127 +0x64
  github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord.(*DistSender).sendToReplicas()
      /go/src/github.com/cockroachdb/cockroach/pkg/kv/kvclient/kvcoord/dist_sender.go:1778 +0x441
```

This is fixed by loading the value with atomic.

Release note: None
Relevant fixes are now committed.

Release note: None
@otan
Copy link
Contributor Author

otan commented Mar 18, 2021

bors r=ajstorm

@craig
Copy link
Contributor

craig bot commented Mar 18, 2021

Build succeeded:

@craig craig bot merged commit 36dea46 into cockroachdb:master Mar 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

multiregionccl: TestMultiRegionAfterEnterpriseDisabled skipped under race
3 participants