cli/demo: fix enterprise features for multitenancy #81737
Conversation
|
This change is |
knz
force-pushed
the
20220524-demo-license
branch
from
b538edd to
0d8efb0
Compare
…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
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
force-pushed
the
20220524-demo-license
branch
from
0d8efb0 to
d373cb1
Compare
81762: democluster: fix `cockroach demo movr --geo-partitioned-replicas --multi-region` r=arulajmani a=knz Prereq to #81737. 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 Co-authored-by: Raphael 'kena' Poss <[email protected]>
There was a problem hiding this comment.
this is great! do you think the change is backportable? the field teams have said that the call to the license server is a problem for them, since we don't have good SLAs for that license server and it has gone down in the past.
Reviewable status:
complete! 0 of 0 LGTMs obtained (waiting on @dt)
|
Yes this is backportable. As-is to 22.1, and then with a new custom patch to 21.2 and earlier. |
|
bors r=rafiss |
|
sounds good -- FWIW, there are no more scheduled 21.1.x releases. |
|
Build succeeded: |
|
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from 3965a6c to blathers/backport-release-21.2-81737: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 21.2.x failed. See errors above. error creating merge commit from d373cb1 to blathers/backport-release-22.1-81737: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 22.1.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
First commit from #81762.
Fixes #80270.
Fixes #40434.
This patch achieves two things:
cockroach demowhen--disable-demo-licenseis not passed as argument.cockroach demodoes not require a working licensingendpoint 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