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

release-22.1: demo: fix enterprise features for multitenancy + remove license API call #82080

Merged
merged 2 commits into from
May 31, 2022

Conversation

knz
Copy link
Contributor

@knz knz commented May 30, 2022

Backport:

Please see individual PRs for details.

/cc @cockroachdb/release

Release justification: bug fix and improvement to rate of CI false negatives

…lti-region`

When using `--geo-partitioned-replicas`, some secondary regions are
added, which is only supported with multitenancy if a cluster setting
is also set. So this commit ensures the cluster setting is set.

NB: no unit tests in this commit because the next commit will ensure
this gets tested.

Release note: None
@knz knz requested review from rafiss and otan May 30, 2022 18:49
@knz knz requested a review from a team as a code owner May 30, 2022 18:49
@knz knz requested a review from a team May 30, 2022 18:49
@knz knz requested a review from a team as a code owner May 30, 2022 18:49
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@knz knz changed the title backport-22.1: demo: fix enterprise features for multitenancy + remove license API call release-22.1: demo: fix enterprise features for multitenancy + remove license API call May 30, 2022
This patch achieves two things:

- it ensures that enterprise features work properly in multi-tenant `cockroach
  demo` when `--disable-demo-license` is not passed as argument.
- it ensures `cockroach demo` does not require a working licensing
  endpoint to run (by not retrieving a license over the network on startup).

The net result will be less spurious failures in CI, as well as
avoiding startup delays/errors during interactive uses, which provide
poor UX.

Release note: None
@knz knz force-pushed the backport22.1-81762-81737 branch from 780e371 to bde7e0f Compare May 31, 2022 08:19
@knz knz merged commit d7f07ff into cockroachdb:release-22.1 May 31, 2022
@knz knz deleted the backport22.1-81762-81737 branch May 31, 2022 11:27
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.

3 participants