sql: fix license acquisition bug and add a flag to disable acquisition #46126
Conversation
|
This change is |
There was a problem hiding this comment.
I'll do a more thorough review in a 2nd pass, thanks for looking at this already
Reviewed 4 of 4 files at r1.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @rohany)
pkg/cli/interactive_tests/test_demo_partitioning.tcl, line 96 at r1 (raw file):
end_test start_test "Expect an error if geo-partitioning is requested and the user disabled license acquisition"
I think this could be an Example_xxx test in cli_test.go?
please also add the -e tests:
- license error with
-eusing a licensed feature and --disable-demo-license - no error with
-e, licensed feature, without --disable-demo-license
rohany
force-pushed
the
demo-license-check
branch
from
0ccafca
to
83e1b64
Compare
There was a problem hiding this comment.
Reviewable status:
pkg/cli/interactive_tests/test_demo_partitioning.tcl, line 96 at r1 (raw file):
Previously, knz (kena) wrote…
I think this could be an
Example_xxxtest in cli_test.go?please also add the
-etests:
- license error with
-eusing a licensed feature and --disable-demo-license- no error with
-e, licensed feature, without --disable-demo-license
Done. I added those tests here though, because a CCL binary is required.
rohany
force-pushed
the
demo-license-check
branch
from
83e1b64
to
6590bbe
Compare
Fixes cockroachdb#46117. Release justification: bug fix Release note (bug fix): This PR fixes a bug where sometimes using `cockroach demo -e` would display a `connection refused` error. Release note (cli change): This PR adds the flag `--disable-demo-license` to provide another option to disable `cockroach demo` from attempting to acquire a demo license.
rohany
force-pushed
the
demo-license-check
branch
from
6590bbe
to
16b1930
Compare
There was a problem hiding this comment.
Reviewed 3 of 3 files at r2.
Reviewable status:
|
bors r=knz |
Build failed |
|
js oom bors r=knz |
Build succeeded |
Fixes #46117.
Release justification: bug fix
Release note (bug fix): This PR fixes a bug where sometimes using
cockroach demo -ewould display aconnection refusederror.Release note (cli change): This PR adds the flag
--disable-demo-licenseto provide another option to disable
cockroach demofrom attemptingto acquire a demo license.