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

testserver: do not verify enterprise license #108762

Merged
merged 48 commits into from
Aug 27, 2023

Conversation

knz
Copy link
Contributor

@knz knz commented Aug 15, 2023

Prior to this patch, for test tenant servers to be automatically used
two conditions needed to hold:

  • the CCL package(s) needed to be imported.
  • an enterprise license needed to be set (usually via ccl.TestingEnableEnterprise())

While we want these conditions to hold to start separate-process SQL
servers in production, they do not need to be verified in unit tests.

NB: as a result of merging this PR, a lot of (recently introduced)
calls to ccl.TestingEnableEnterprise() in various main_test.go
files are now unnecessary. Cleaning them up can be pushed to a later
phase.

Release note: None

Epic: CRDB-18499
Fixes #104500.
Fixes #108761.
Informs #76378

@knz knz requested review from stevendanna and yuzefovich August 15, 2023 10:30
@knz knz requested review from a team as code owners August 15, 2023 10:30
@knz knz requested review from rachitgsrivastava and DarrylWong and removed request for a team August 15, 2023 10:30
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Collaborator

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

Will be interesting to see what CI says about this!

@knz

This comment was marked as outdated.

@knz
Copy link
Contributor Author

knz commented Aug 16, 2023

I have added the list to the issue #76378.

@yuzefovich
Copy link
Member

Just wanted to point out that the actual number of tests that require fixing is larger than what the screenshot shows. This is because some of the failures result in crashes, so the whole package counts as a single failure (although there might be more lurking).

@knz
Copy link
Contributor Author

knz commented Aug 17, 2023

yes, that is true, but at least the list of packages is complete (and it was longer than in the screenshot, the screenshot was taken when the CI run wasn't complete yet)

knz and others added 10 commits August 26, 2023 12:37
This will make it possible to merge the change that enables tenant
selection everywhere before we investigate the test failures in detail.

Release note: None
Some of the tests are properly fixes, others have skips associated with
them.

Release note: None
Some packages contain many tests that fail when run with a virtual
cluster active. Until we have time to investigate them in details,
opt them out.

Release note: None
@knz knz force-pushed the 20230815-disable-enterprise-check branch 2 times, most recently from f0576b3 to d0512f9 Compare August 26, 2023 11:12
knz added 7 commits August 27, 2023 08:54
Some packages contain many tests that fail when run with a virtual
cluster active. Until we have time to investigate them in details,
opt them out.

Release note: None
Prior to this patch, for test tenant servers to be automatically used
two conditions needed to hold:

- the CCL package(s) needed to be imported.
- an enterprise license needed to be set (usually via `ccl.TestingEnableEnterprise()`)

While we want these conditions to hold to start separate-process SQL
servers in production, they do not need to be verified in unit tests.

NB: as a result of merging this PR, numerous (recently introduced)
calls to `ccl.TestingEnableEnterprise()` in various `main_test.go`
files are now unnecessary. Cleaning them up can be pushed to a later
phase.

Release note: None
Release note: None
@knz knz force-pushed the 20230815-disable-enterprise-check branch from d0512f9 to 11be180 Compare August 27, 2023 06:56
@craig craig bot merged commit 671500b into cockroachdb:master Aug 27, 2023
@knz knz deleted the 20230815-disable-enterprise-check branch August 27, 2023 07:52
herkolategan added a commit to herkolategan/cockroach that referenced this pull request Oct 26, 2023
Previously a CCL license was required for the default test tenant to be started.
This requirement no longer holds true, hence the comment has been updated.

See also: cockroachdb#108762

Epic: CRDB-31933
Release note: None
herkolategan added a commit to herkolategan/cockroach that referenced this pull request Oct 31, 2023
Previously a CCL license was required for the default test tenant to be started.
This requirement no longer holds true, hence the comment has been updated.

See also: cockroachdb#108762

Epic: CRDB-31933
Release note: None
herkolategan added a commit to herkolategan/cockroach that referenced this pull request Nov 2, 2023
Previously a CCL license was required for the default test tenant to be started.
This requirement no longer holds true, hence the comment has been updated.

See also: cockroachdb#108762

Epic: CRDB-31933
Release note: None
herkolategan added a commit to herkolategan/cockroach that referenced this pull request Nov 2, 2023
Previously a CCL license was required for the default test tenant to be started.
This requirement no longer holds true, hence the comment has been updated.

See also: cockroachdb#108762

Epic: CRDB-31933
Release note: None
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants