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

server: rework TestClusterVersionBootstrapStrict #34651

Merged
merged 1 commit into from
Feb 6, 2019
Merged

server: rework TestClusterVersionBootstrapStrict #34651

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 27 additions & 32 deletions pkg/server/version_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ package server_test
import (
"context"
gosql "database/sql"
"fmt"
"path/filepath"
"strconv"
"sync/atomic"
Expand Down Expand Up @@ -312,44 +313,38 @@ func TestClusterVersionUpgrade(t *testing.T) {
}
}

func TestClusterVersionBootstrapStrict(t *testing.T) {
// Test that, after cluster bootstrap, the different ways of getting the cluster
// version all agree.
func TestAllVersionsAgree(t *testing.T) {
defer leaktest.AfterTest(t)()
ctx := context.Background()

// Four nodes that are all strictly version X without accepting anything else.
for _, versions := range [][][2]string{
{{"1.1", "1.1"}, {"1.1", "1.1"}, {"1.1", "1.1"}, {"1.1", "1.1"}},
{{"4.7", "4.7"}, {"4.7", "4.7"}, {"4.7", "4.7"}, {"4.7", "4.7"}},
} {
func() {
bootstrapVersion := cluster.ClusterVersion{
Version: roachpb.MustParseVersion(versions[0][0]),
}

knobs := base.TestingKnobs{
Store: &storage.StoreTestingKnobs{
BootstrapVersion: &bootstrapVersion,
},
}
tc := setupMixedCluster(t, knobs, versions, "")
defer tc.Stopper().Stop(ctx)
tcRaw := testcluster.StartTestCluster(t, 3, base.TestClusterArgs{})
defer tcRaw.Stopper().Stop(ctx)
tc := testClusterWithHelpers{
T: t,
TestCluster: tcRaw,
}

exp := versions[0][0]
exp := cluster.BinaryServerVersion.String()

for i := 0; i < tc.NumServers(); i++ {
if version := tc.getVersionFromSetting(i).Version().Version.String(); version != exp {
t.Fatalf("%d: incorrect version %s (wanted %s)", i, version, exp)
}
if version := tc.getVersionFromShow(i); version != exp {
t.Fatalf("%d: incorrect version %s (wanted %s)", i, version, exp)
}

if version := tc.getVersionFromSelect(i); version != exp {
t.Fatalf("%d: incorrect version %q (wanted %s)", i, version, exp)
}
// The node bootstrapping the cluster starts at BinaryServerVersion, the
// others start at MinimumSupportedVersion and it takes them a gossip update
// to get to BinaryServerVersion. Hence, we loop until that gossip comes.
testutils.SucceedsSoon(tc, func() error {
for i := 0; i < tc.NumServers(); i++ {
if version := tc.getVersionFromSetting(i).Version().Version.String(); version != exp {
return fmt.Errorf("%d: incorrect version %s (wanted %s)", i, version, exp)
}
}()
}
if version := tc.getVersionFromShow(i); version != exp {
return fmt.Errorf("%d: incorrect version %s (wanted %s)", i, version, exp)
}
if version := tc.getVersionFromSelect(i); version != exp {
return fmt.Errorf("%d: incorrect version %q (wanted %s)", i, version, exp)
}
}
return nil
})
}

func TestClusterVersionMixedVersionTooOld(t *testing.T) {
Expand Down