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.

Sign up for GitHub

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

Jump to bottom

clusterversion: set binaryMinSupportedVersion to v21_1 #67281

Merged
merged 3 commits into from
Aug 3, 2021
Merged

clusterversion: set binaryMinSupportedVersion to v21_1 #67281

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad450b1
migrations: fix TruncatedStateMigrationTest to inject the appropriate…
ajwerner Jul 29, 2021
e41dd01
migration/migrationmanager: validate the cluster version before migra…
ajwerner Jul 29, 2021
42e952d
clusterversion: set `binaryMinSupportedVersion` to `v21_1`
ajwerner Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions pkg/migration/migrations/truncated_state_external_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
"github.com/cockroachdb/cockroach/pkg/kv/kvserver/stateloader"
"github.com/cockroachdb/cockroach/pkg/server"
"github.com/cockroachdb/cockroach/pkg/settings/cluster"
"github.com/cockroachdb/cockroach/pkg/testutils/testcluster"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
"github.com/cockroachdb/errors"
Expand All @@ -30,6 +31,10 @@ func TestTruncatedStateMigration(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()

minVersion := clusterversion.ByKey(clusterversion.V20_2)
binaryVersion := clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration + 1)
truncStateVersion := clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration)
bootstrapVersion := clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration - 1)
for _, testCase := range []struct {
name string
typ stateloader.TruncatedStateType
Expand All @@ -39,21 +44,36 @@ func TestTruncatedStateMigration(t *testing.T) {
{"ts=legacy,as=legacy", stateloader.TruncatedStateLegacyReplicatedAndNoAppliedKey},
} {
t.Run(testCase.name, func(t *testing.T) {
args := base.TestClusterArgs{}
args.ServerArgs.Knobs.Store = &kvserver.StoreTestingKnobs{TruncatedStateTypeOverride: &testCase.typ}
args.ServerArgs.Knobs.Server = &server.TestingKnobs{
// TruncatedAndRangeAppliedStateMigration is part of the
// migration that lets us stop using the legacy truncated state.
// When the active cluster version is greater than it, we assert
// against the presence of legacy truncated state and ensure
// we're using the range applied state key. In this test we'll
// start of at the version immediately preceding the migration,
// and migrate past it.
BinaryVersionOverride: clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration - 1),
// We want to exercise manual control over the upgrade process.
DisableAutomaticVersionUpgrade: 1,
makeArgs := func() (args base.TestServerArgs) {
minVersion := minVersion
Copy link
Contributor

Choose a reason for hiding this comment

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

Why have these?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Detritus. I think at some point for some reason there were some pointers involved. Removed.

binaryVersion := binaryVersion
bootstrapVersion := bootstrapVersion
args.Settings = cluster.MakeTestingClusterSettingsWithVersions(
binaryVersion, minVersion, false,
)
args.Knobs.Store = &kvserver.StoreTestingKnobs{TruncatedStateTypeOverride: &testCase.typ}
args.Knobs.Server = &server.TestingKnobs{
// TruncatedAndRangeAppliedStateMigration is part of the
// migration that lets us stop using the legacy truncated state.
// When the active cluster version is greater than it, we assert
// against the presence of legacy truncated state and ensure
// we're using the range applied state key. In this test we'll
// start of at the version immediately preceding the migration,
// and migrate past it.
BinaryVersionOverride: bootstrapVersion,
// We want to exercise manual control over the upgrade process.
DisableAutomaticVersionUpgrade: 1,
}
return args
}
tc := testcluster.StartTestCluster(t, 3, args)

tc := testcluster.StartTestCluster(t, 3, base.TestClusterArgs{
ServerArgsPerNode: map[int]base.TestServerArgs{
0: makeArgs(),
1: makeArgs(),
2: makeArgs(),
},
})
defer tc.Stopper().Stop(ctx)

forAllReplicas := func(f func(*kvserver.Replica) error) error {
Expand Down Expand Up @@ -118,13 +138,13 @@ func TestTruncatedStateMigration(t *testing.T) {
// happened as part of the initial up-replication.
t.Logf("ranges with legacy keys before migration: %v", legacyRanges)

_, err := tc.Conns[0].ExecContext(ctx, `SET CLUSTER SETTING version = $1`,
clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration+1).String())
_, err := tc.Conns[0].ExecContext(
ctx, `SET CLUSTER SETTING version = $1`, binaryVersion.String(),
)
require.NoError(t, err)
require.Zero(t, getLegacyRanges())

require.NoError(t, forAllReplicas(func(repl *kvserver.Replica) error {
truncStateVersion := clusterversion.ByKey(clusterversion.TruncatedAndRangeAppliedStateMigration)
if repl.Version().Less(truncStateVersion) {
return errors.Newf("unexpected version %s", repl.Version())
}
Expand Down