-
Notifications
You must be signed in to change notification settings - Fork 3.8k
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
logictest: add local-mixed-23.1-23.2 as a default config #104994
Conversation
0772754
to
cb06b02
Compare
This ensures that we test logic tests with a system schema bootstrapped from 23.1. This also renames local-mixed-22.2-23.1 to instead to be local-mixed-22.2-23.2, since we want to test skipping version 23.1. Release note: None
cb06b02
to
64f3b22
Compare
@postamar I tried making a new logictest config like this:
However, the test setup fails here: cockroach/pkg/sql/logictest/logic.go Lines 1883 to 1889 in 795dd78
with the error:
This seems like it might have something to do with the initialvalues for V23_1. Do you have any ideas for how to debug this? |
As discussed this looks like the failure of a That's the proximal cause however, deeper down I suspect it's related to the test cluster not being set up correctly somehow; we're doing something relatively new and, until now, uncommon, in which we start a test cluster at a version which is neither the min-supported version or the binary version. I'm curious how mixed-version clusters started using the go-testserver framework will behave. |
#112122 replaced this |
This commit fixes the logic around bootstrapping clusters at earlier versions. Currently there is some special casing around the minimum supported version which makes that work, but other backwards compatible versions don't work correctly. Specifically, after bumping the version to 24.1, a `local-mixed-23.2` config for logic tests does not work. The core problem is that we are initializing the stores with a version and then populating the initial system values at another version. I am reasonably confident this was the root cause for cockroachdb#104994, where we tried adding a 23.1 config while the min supported version was 22.2. This fix makes the logic clearer and simpler. We can only bootstrap the cluster at specific versions (the current version, and compatible released versions). When the bootstrap version is overridden, we find the latest version that we can initialize the cluster and use that for both the stores and the initial values. Then we can upgrade to the desired version from there. This simplifies the tests: we no longer need `BootstrapVersionKeyOverride` (which was confusing, given that we also have `BinaryVersionOverride`). Epic: none Release note: None
This commit fixes the logic around bootstrapping clusters at earlier versions. Currently there is some special casing around the minimum supported version which makes that work, but other backwards compatible versions don't work correctly. Specifically, after bumping the version to 24.1, a `local-mixed-23.2` config for logic tests does not work. The core problem is that we are initializing the stores with a version and then populating the initial system values at another version. I am reasonably confident this was the root cause for cockroachdb#104994, where we tried adding a 23.1 config while the min supported version was 22.2. This fix makes the logic clearer and simpler. We can only bootstrap the cluster at specific versions (the current version, and compatible released versions). When the bootstrap version is overridden, we find the latest version that we can initialize the cluster and use that for both the stores and the initial values. Then we can upgrade to the desired version from there. This simplifies the tests: we no longer need `BootstrapVersionKeyOverride` (which was confusing, given that we also have `BinaryVersionOverride`). Epic: none Release note: None
112385: bootstrap: fix and clean up bootstrapping at older versions r=RaduBerinde a=RaduBerinde Note: this PR is only for the top commit, the rest is #112456. ---- This commit fixes the logic around bootstrapping clusters at earlier versions. Currently there is some special casing around the minimum supported version which makes that work, but other backwards compatible versions don't work correctly. Specifically, after bumping the version to 24.1, a `local-mixed-23.2` config for logic tests does not work. The core problem is that we are initializing the stores with a version and then populating the initial system values at another version. I am reasonably confident this was the root cause for #104994, where we tried adding a 23.1 config while the min supported version was 22.2. This fix makes the logic clearer and simpler. We can only bootstrap the cluster at specific versions (the current version, and compatible released versions). When the bootstrap version is overridden, we find the latest version that we can initialize the cluster and use that for both the stores and the initial values. Then we can upgrade to the desired version from there. This simplifies the tests: we no longer need `BootstrapVersionKeyOverride` (which was confusing, given that we also have `BinaryVersionOverride`). Epic: none Release note: None Co-authored-by: Radu Berinde <[email protected]>
informs #103956
This ensures that we test logic tests with a system schema bootstrapped from 23.1.
This also renames local-mixed-22.2-23.1 to instead to be local-mixed-22.2-23.2, since we want to test skipping version 23.1.
Release note: None